diff options
| author | Tinic Uro <turo@macromedia.com> | 2004-02-06 23:56:37 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-02-06 23:56:37 +0000 |
| commit | 747a0554ea8ad09404c1f5b80239ebd8d71b291e (patch) | |
| tree | cbdc2b6bea2d6aa2a9b83b634ef12bad24b8ed13 /libavcodec | |
| parent | 8cb5d4c060cf2bd6c7d10bb151e4bceedf821379 (diff) | |
| download | ffmpeg-747a0554ea8ad09404c1f5b80239ebd8d71b291e.tar.gz | |
- made --extra-cflags option work on darwin
- allow INTER4V macroblocks for FLV1 codec
- fixed issue in flv file format saving 8 mp3 frames per packet instead of 1
- fixed crasher in flv file format involving mp3 buffer handling
- added FLV1 codec support for swf file format (FlashPlayer6 or above
required) and made it default
- fixed broken mp3 support in swf file format
patch by (Tinic Uro <turo at macromedia dot com>)
cleanup by me
Originally committed as revision 2756 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 30ab390e3a..41347a98b0 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -748,7 +748,7 @@ int MPV_encode_init(AVCodecContext *avctx) } if((s->flags & CODEC_FLAG_4MV) && s->codec_id != CODEC_ID_MPEG4 - && s->codec_id != CODEC_ID_H263 && s->codec_id != CODEC_ID_H263P){ + && s->codec_id != CODEC_ID_H263 && s->codec_id != CODEC_ID_H263P && s->codec_id != CODEC_ID_FLV1){ av_log(avctx, AV_LOG_ERROR, "4MV not supported by codec\n"); return -1; } |