RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-21 23:03:13 +00:00
Code Issues Projects Releases Wiki Activity
28,662 Commits 2 Branches 400 Tags 260 MiB
3188d33a11
Commit Graph

2 Commits

Author SHA1 Message Date
Michael Niedermayer
5d6c5dd36c Merge remote-tracking branch 'ffmpeg-mt/master' 
* 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>
 2011-03-25 02:51:20 +01:00
Michael Niedermayer
d375c10400 Fake-Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-22 22:36:57 +01:00