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 /libav | |
| parent | 005ba718846a00c0a432c4ab58666111942a0a2f (diff) | |
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 'libav')
| -rw-r--r-- | libav/asf.c | 4 | ||||
| -rw-r--r-- | libav/avienc.c | 2 | ||||
| -rw-r--r-- | libav/utils.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/libav/asf.c b/libav/asf.c index 74d092ab9e..4f82e65fa1 100644 --- a/libav/asf.c +++ b/libav/asf.c @@ -1224,7 +1224,7 @@ AVOutputFormat asf_oformat = { #else CODEC_ID_MP2, #endif - CODEC_ID_MSMPEG4, + CODEC_ID_MSMPEG4V3, asf_write_header, asf_write_packet, asf_write_trailer, @@ -1241,7 +1241,7 @@ AVOutputFormat asf_stream_oformat = { #else CODEC_ID_MP2, #endif - CODEC_ID_MSMPEG4, + CODEC_ID_MSMPEG4V3, asf_write_stream_header, asf_write_packet, asf_write_trailer, diff --git a/libav/avienc.c b/libav/avienc.c index 370fa3e3cd..561c88c077 100644 --- a/libav/avienc.c +++ b/libav/avienc.c @@ -418,7 +418,7 @@ static AVOutputFormat avi_oformat = { "avi", sizeof(AVIContext), CODEC_ID_MP2, - CODEC_ID_MSMPEG4, + CODEC_ID_MSMPEG4V3, avi_write_header, avi_write_packet, avi_write_trailer, diff --git a/libav/utils.c b/libav/utils.c index 8a609a9b22..0c12561b8d 100644 --- a/libav/utils.c +++ b/libav/utils.c @@ -536,6 +536,9 @@ int av_find_stream_info(AVFormatContext *ic) st->codec_info_state = CSTATE_FOUND; codec = avcodec_find_decoder(st->codec.codec_id); if (codec) { + if(codec->capabilities & CODEC_CAP_TRUNCATED) + st->codec.flags |= CODEC_FLAG_TRUNCATED; + ret = avcodec_open(&st->codec, codec); if (ret >= 0) st->codec_info_state = CSTATE_DECODING; |