diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-29 17:05:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-29 17:05:51 +0100 |
| commit | fbafd64acce4a2a0aa6a5b392524a99f397e96a8 (patch) | |
| tree | d75aec398f51fa4721cf5bcc9175a1e6e17676c5 /libavcodec/bmpenc.c | |
| parent | cfe282ec80dc03667418c601283134eec25f17cf (diff) | |
| parent | 54b2ce7418c0e1467c9e67274e55e1bd86189e63 (diff) | |
| download | ffmpeg-fbafd64acce4a2a0aa6a5b392524a99f397e96a8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpeg: Drop unused parameters from ff_draw_horiz_band()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bmpenc.c')
0 files changed, 0 insertions, 0 deletions