diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 15:53:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 15:53:58 +0100 |
| commit | 5cb0782b952f5e04fd686d31ed5754e235cc2742 (patch) | |
| tree | c63b35f4cfb2b3c83d246b9748491fa0a8c4a148 /libswscale | |
| parent | c46943ec19df5077610518e3dae6184414ef435d (diff) | |
| parent | 04f4dbc2fa7c17c915300cade64947531124100e (diff) | |
| download | ffmpeg-5cb0782b952f5e04fd686d31ed5754e235cc2742.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo_enc: fix indentation in load_input_picture()
Conflicts:
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions