diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 20:19:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 20:53:34 +0200 |
| commit | 0d225863f2c9855c6c39890da63f1fc6d6fb9391 (patch) | |
| tree | 9a81fa6a70befbcb9f7f036bccb7fc81638465c3 /libswresample | |
| parent | 836b60ce2b497615432b90a33146e4547ee82586 (diff) | |
| parent | 17a75a8c0902a86a1e933312e562a40656e281e3 (diff) | |
| download | ffmpeg-0d225863f2c9855c6c39890da63f1fc6d6fb9391.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libxvid: fix missing end of line character
Conflicts:
libavcodec/libxvid.c
No change as the buggy modification wasnt merged, ffmpeg handles the
case where both lumi and variance masking are set, differently
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions