diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 13:22:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 13:23:42 +0100 |
| commit | ef4e54e0df444142b7c975340df7ac478a598d20 (patch) | |
| tree | 5b1da1fa822306a2398db2392bbd181b73b3933b /libavcodec/jpeglsdec.c | |
| parent | 94cf1ef008c251923ec96b71022f03133d4d9304 (diff) | |
| parent | 28d82b7675bea76a1349070a3cdd737d964d4775 (diff) | |
| download | ffmpeg-ef4e54e0df444142b7c975340df7ac478a598d20.tar.gz | |
Merge commit '28d82b7675bea76a1349070a3cdd737d964d4775'
* commit '28d82b7675bea76a1349070a3cdd737d964d4775':
vc1dec: refactor check with missing parenthesis
Conflicts:
libavcodec/vc1_mc.c
tests/ref/fate/vc1_ilaced_twomv
Theres no change to the reference checksums as this bug was not
in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsdec.c')
0 files changed, 0 insertions, 0 deletions