diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 02:34:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 02:34:25 +0100 |
| commit | 4e251b23c31a81f7fda17f5468bcd8b70a757931 (patch) | |
| tree | 7ffefb65f3dbc070e856a8ae6d96ddf29690b1a1 /libavcodec/xiph.c | |
| parent | 9b669f9b14134c5d3e9f03ae987ade15689bd14c (diff) | |
| parent | 61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba (diff) | |
| download | ffmpeg-4e251b23c31a81f7fda17f5468bcd8b70a757931.tar.gz | |
Merge commit '61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba' into release/2.4
* commit '61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba':
lavc: fix bitshifts amount bigger than the type
Conflicts:
libavcodec/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xiph.c')
0 files changed, 0 insertions, 0 deletions