Merge remote-tracking branch 'ffmpeg-mt/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Mar 2011 01:37:37 +0000 (02:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Mar 2011 01:51:20 +0000 (02:51 +0100)
commit5d6c5dd36c024784a9cd36391c3698c2f1f2d2ab
tree38a5e809995dab9ee4232c3cb38063d6539b19a7
parent3eb9e571dc8ddfc9d1ae99c2ee75f607181819c7
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>
libavcodec/mpegvideo.c
mt-work/test-failures.txt [deleted file]