diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-11-08 18:35:39 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-11-08 18:35:39 +0000 |
| commit | d7425f59d5fc01bccde90cccd42ba592961b2d03 (patch) | |
| tree | 8850da761a569ae73679a833425117066270ca42 /libavcodec/mpeg12.c | |
| parent | 005ba718846a00c0a432c4ab58666111942a0a2f (diff) | |
| download | ffmpeg-d7425f59d5fc01bccde90cccd42ba592961b2d03.tar.gz | |
cleanup (breaks compatibility, requested by fabrice)
remove CODEC_FLAG_NOT_TRUNCATED & add CODEC_FLAG_TRUNCATED
add CODEC_CAP_TRUNCATED
add alpha plane to AVPicture
remove CODEC_ID_MSMPEG4
remove various unused stuff
support "truncated" mpeg4 streams
Originally committed as revision 1175 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index a435fe8c0b..f0dfd1912f 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1876,7 +1876,7 @@ static int mpeg_decode_frame(AVCodecContext *avctx, } else { memcpy(s->buf_ptr, buf_start, len); s->buf_ptr += len; - if( (s2->flags&CODEC_FLAG_NOT_TRUNCATED) && (!start_code_found) + if( (!(s2->flags&CODEC_FLAG_TRUNCATED)) && (!start_code_found) && s->buf_ptr+4<s->buffer+s->buffer_size){ start_code_found= 1; code= 0x1FF; @@ -1971,5 +1971,5 @@ AVCodec mpeg_decoder = { NULL, mpeg_decode_end, mpeg_decode_frame, - CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, + CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED, }; |