diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 18:27:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 18:28:49 +0100 |
| commit | c53a1507aa097ad4793c0d4f840da09dba6ffbaf (patch) | |
| tree | 9f50c9950b68aea04a5221dbedc6f9040816d236 /libswresample | |
| parent | ad0cf8e063b846cd3653875a1b88c7469fd257a1 (diff) | |
| parent | 199d9f995da53fe2507821f6d96bbc692574e1a9 (diff) | |
| download | ffmpeg-c53a1507aa097ad4793c0d4f840da09dba6ffbaf.tar.gz | |
Merge commit '199d9f995da53fe2507821f6d96bbc692574e1a9'
* commit '199d9f995da53fe2507821f6d96bbc692574e1a9':
mjpegdec: fix undefined shift
Conflicts:
libavcodec/mjpegdec.c
See: b4329605289e25bb071ec1c1182bf25fc83b09aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions