diff options
| author | clsid2 <clsid2@users.sourceforge.net> | 2010-05-27 16:10:56 +0400 |
|---|---|---|
| committer | clsid2 <clsid2@users.sourceforge.net> | 2010-05-27 16:10:56 +0400 |
| commit | 96084bc5c1a3d4e74ba9e240ea6d13387cae0f7f (patch) | |
| tree | 5d72b7c705add27c0f70aee1350dfdee1a1f0896 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263dec.c | |
| parent | a51f307401c448b89a9d1064453fd40c6af5ae21 (diff) | |
Updated FFmpeg
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1959 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263dec.c')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263dec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263dec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263dec.c index ffb380bc2..b5c5c37f4 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263dec.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263dec.c @@ -21,7 +21,7 @@ */
/**
- * @file libavcodec/h263dec.c
+ * @file
* H.263 decoder.
*/
@@ -417,7 +417,9 @@ retry: if(s->xvid_build==-1 && s->divx_version==-1 && s->lavc_build==-1){
if(s->stream_codec_tag == AV_RL32("XVID") ||
s->codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVIX") ||
- s->codec_tag == AV_RL32("RMP4"))
+ s->codec_tag == AV_RL32("RMP4") ||
+ s->codec_tag == AV_RL32("SIPP")
+ )
s->xvid_build= 0;
#if 0
if(s->codec_tag == AV_RL32("DIVX") && s->vo_type==0 && s->vol_control_parameters==1
@@ -701,7 +703,7 @@ av_log(avctx, AV_LOG_DEBUG, "%"PRId64"\n", rdtsc()-time); AVCodec h263_decoder = {
"h263",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_H263,
sizeof(MpegEncContext),
ff_h263_decode_init,
|