-
Michael Niedermayer authored
* qatar/master: mpegvideo_enc: fix indentation in load_input_picture() Conflicts: libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
5cb0782b
* qatar/master:
mpegvideo_enc: fix indentation in load_input_picture()
Conflicts:
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>