* 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>