diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 03:16:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 03:16:38 +0100 |
| commit | cdbebae44440bea97f300f256d722c1495753bc2 (patch) | |
| tree | b9fc7a0e480d3c10bd950cd8495b48982f78de78 /libavcodec/dirac.h | |
| parent | 8426edef4cf521104bb9288ac46a48dc4bdaee53 (diff) | |
| parent | 85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa (diff) | |
| download | ffmpeg-cdbebae44440bea97f300f256d722c1495753bc2.tar.gz | |
Merge commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa'
* commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa':
lavc: fix bitshifts amount bigger than the type
Conflicts:
libavcodec/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dirac.h')
0 files changed, 0 insertions, 0 deletions