Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'ffmpeg-mt/master' | Michael Niedermayer | 2011-03-30 |
| | | | | | | | | | | | | | | | * ffmpeg-mt/master: Update todo. More items appeared... Fix mdec Duplicate: id3v1: change filesize to int64_t. Duplicate: id3v1: Seek back to old position after reading. Conflicts: libavcodec/mpegvideo.c libavcodec/snow.c libavformat/id3v1.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | ||
* | Merge remote-tracking branch 'ffmpeg-mt/master' | Michael Niedermayer | 2011-03-25 |
| | | | | | | | | | | | * ffmpeg-mt/master: Update todo. Draw edges in MPV_frame_end when encoding Conflicts: libavcodec/mpegvideo.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | ||
* | Fake-Merge remote-tracking branch 'ffmpeg-mt/master' | Michael Niedermayer | 2011-03-22 |