diff options
author | Alberto Delmás <adelmas@gmail.com> | 2012-08-24 17:45:57 +0200 |
---|---|---|
committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2012-08-31 07:37:16 +0200 |
commit | ee769c6a7c1d4ec6560f5e5a6f457b770b10fb33 (patch) | |
tree | c1a3fc95ccfc0d84bfa9edfa22adc85cdcdbd6da /libavcodec/h263dec.c | |
parent | d96d6ba61888c6a97d9426ca80bf36f3812cac76 (diff) | |
download | ffmpeg-ee769c6a7c1d4ec6560f5e5a6f457b770b10fb33.tar.gz |
MSS2 decoder
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Diffstat (limited to 'libavcodec/h263dec.c')
-rw-r--r-- | libavcodec/h263dec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 6bb6204d97..8e6085beeb 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -58,7 +58,10 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) s->quant_precision=5; s->decode_mb= ff_h263_decode_mb; s->low_delay= 1; - avctx->pix_fmt= avctx->get_format(avctx, avctx->codec->pix_fmts); + if (avctx->codec->id == AV_CODEC_ID_MSS2) + avctx->pix_fmt = PIX_FMT_YUV420P; + else + avctx->pix_fmt = avctx->get_format(avctx, avctx->codec->pix_fmts); s->unrestricted_mv= 1; /* select sub codec */ @@ -93,6 +96,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) case AV_CODEC_ID_WMV3: case AV_CODEC_ID_VC1IMAGE: case AV_CODEC_ID_WMV3IMAGE: + case AV_CODEC_ID_MSS2: s->h263_pred = 1; s->msmpeg4_version=6; avctx->chroma_sample_location = AVCHROMA_LOC_LEFT; |