diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 13:54:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 14:49:32 +0200 |
| commit | 209f92d94a49cad7eb8266d53dd2e63ee0a55168 (patch) | |
| tree | d308b0de31132846ab3e3af08fb18cf2ddac7379 | |
| parent | 8d0ec6e060b23c8ef188d759f59ee1e536c494ed (diff) | |
| download | ffmpeg-209f92d94a49cad7eb8266d53dd2e63ee0a55168.tar.gz | |
lavc: add seperate AVCodec for CODEC_ID_H263P so demuxers can use that id.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/allcodecs.c | 2 | ||||
| -rw-r--r-- | libavcodec/h263dec.c | 21 |
2 files changed, 21 insertions, 2 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 963f1a5cac..3b18f57ba1 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -128,7 +128,7 @@ void avcodec_register_all(void) REGISTER_ENCDEC (H261, h261); REGISTER_ENCDEC (H263, h263); REGISTER_DECODER (H263I, h263i); - REGISTER_ENCODER (H263P, h263p); + REGISTER_ENCDEC (H263P, h263p); REGISTER_DECODER (H264, h264); REGISTER_DECODER (H264_CRYSTALHD, h264_crystalhd); REGISTER_DECODER (H264_VDPAU, h264_vdpau); diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 4d3c7b8724..b0b2baa8ed 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -66,6 +66,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) /* select sub codec */ switch(avctx->codec->id) { case CODEC_ID_H263: + case CODEC_ID_H263P: s->unrestricted_mv= 0; avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; break; @@ -111,7 +112,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) avctx->hwaccel= ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt); /* for h263, we allocate the images after having read the header */ - if (avctx->codec->id != CODEC_ID_H263 && avctx->codec->id != CODEC_ID_MPEG4) + if (avctx->codec->id != CODEC_ID_H263 && avctx->codec->id != CODEC_ID_H263P && avctx->codec->id != CODEC_ID_MPEG4) if (ff_MPV_common_init(s) < 0) return -1; @@ -373,6 +374,8 @@ uint64_t time= rdtsc(); next= ff_mpeg4_find_frame_end(&s->parse_context, buf, buf_size); }else if(CONFIG_H263_DECODER && s->codec_id==CODEC_ID_H263){ next= ff_h263_find_frame_end(&s->parse_context, buf, buf_size); + }else if(CONFIG_H263P_DECODER && s->codec_id==CODEC_ID_H263P){ + next= ff_h263_find_frame_end(&s->parse_context, buf, buf_size); }else{ av_log(s->avctx, AV_LOG_ERROR, "this codec does not support truncated bitstreams\n"); return -1; @@ -770,3 +773,19 @@ AVCodec ff_h263_decoder = { .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), .pix_fmts = ff_hwaccel_pixfmt_list_420, }; + +AVCodec ff_h263p_decoder = { + .name = "h263p", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_H263P, + .priv_data_size = sizeof(MpegEncContext), + .init = ff_h263_decode_init, + .close = ff_h263_decode_end, + .decode = ff_h263_decode_frame, + .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | + CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, + .flush = ff_mpeg_flush, + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), + .pix_fmts = ff_hwaccel_pixfmt_list_420, +}; |