Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'ffmpeg-mt/master' | Michael Niedermayer | 2011-03-25 | 1 | -2896/+0 |
| | | | | | | | | | | | * 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 | 8 | -0/+3214 |