Merge commit 'aec25b1c'
* commit 'aec25b1c': mpegvideo: split the encoding-only parts of frame_start() into a separate function Conflicts: libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment