diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 00:14:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 00:15:16 +0100 |
| commit | 3e486162267f1de4447dc6e6bd45ac666647ba7e (patch) | |
| tree | 17c0968c01c1e09c4a792a579950095e7ba1f15e /libavcodec/gsm_parser.c | |
| parent | 4f3f5ee1ac93797954eb66ef4d19e2256c0aaee7 (diff) | |
| parent | 9a60b1fad02cb783b895b2145c3dafc01f7b337c (diff) | |
| download | ffmpeg-3e486162267f1de4447dc6e6bd45ac666647ba7e.tar.gz | |
Merge commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c'
* commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c':
libswscale: fix compiler warnings enumerated type mixed with another type
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gsm_parser.c')
0 files changed, 0 insertions, 0 deletions