RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
29,299 Commits 36 Branches 392 Tags 311 MiB
Commit Graph

3 Commits

Author SHA1 Message Date
Michael Niedermayer 55ce3c67bb Merge remote-tracking branch 'ffmpeg-mt/master' 
* 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>
 2011-03-30 02:58:38 +02:00
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