Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-25 00:34:04 +0300
committerMichael Niedermayer <michaelni@gmx.at>2015-02-25 00:34:08 +0300
commit11fb6258582d31bebf50ae02fbc301bbac613c2d (patch)
treeb5cae1ed6d5763aabdb4d7418484de8a516afb22 /libavformat/rtpdec_h263.c
parent4c8a556a773c9706618b8e5d14b68a06631fb79f (diff)
parent2b982e92f42a6e661d90b12b6592cd13cae496d4 (diff)
Merge commit '2b982e92f42a6e661d90b12b6592cd13cae496d4'
* commit '2b982e92f42a6e661d90b12b6592cd13cae496d4': rtpdec: Set need_parsing via a handler field Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_h263.c')
-rw-r--r--libavformat/rtpdec_h263.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/libavformat/rtpdec_h263.c b/libavformat/rtpdec_h263.c
index ae4cc27040..97aa4add36 100644
--- a/libavformat/rtpdec_h263.c
+++ b/libavformat/rtpdec_h263.c
@@ -24,15 +24,6 @@
#include "libavutil/attributes.h"
#include "libavutil/intreadwrite.h"
-static av_cold int h263_init(AVFormatContext *ctx, int st_index,
- PayloadContext *data)
-{
- if (st_index < 0)
- return 0;
- ctx->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL;
- return 0;
-}
-
int ff_h263_handle_packet(AVFormatContext *ctx, PayloadContext *data,
AVStream *st, AVPacket *pkt, uint32_t *timestamp,
const uint8_t *buf, int len, uint16_t seq, int flags)
@@ -102,7 +93,7 @@ RTPDynamicProtocolHandler ff_h263_1998_dynamic_handler = {
.enc_name = "H263-1998",
.codec_type = AVMEDIA_TYPE_VIDEO,
.codec_id = AV_CODEC_ID_H263,
- .init = h263_init,
+ .need_parsing = AVSTREAM_PARSE_FULL,
.parse_packet = ff_h263_handle_packet,
};
@@ -110,6 +101,6 @@ RTPDynamicProtocolHandler ff_h263_2000_dynamic_handler = {
.enc_name = "H263-2000",
.codec_type = AVMEDIA_TYPE_VIDEO,
.codec_id = AV_CODEC_ID_H263,
- .init = h263_init,
+ .need_parsing = AVSTREAM_PARSE_FULL,
.parse_packet = ff_h263_handle_packet,
};