diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-05 01:27:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-05 01:27:48 +0100 |
| commit | bd9492174d978f9d8b82d945cda9b5a52f0fa437 (patch) | |
| tree | 9386abe2d1139c16a1f54c691ffaebc18a46475a /libswresample | |
| parent | dcbc748ad11b7a683c54b4afc350f734adcded4e (diff) | |
| parent | 190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c (diff) | |
| download | ffmpeg-bd9492174d978f9d8b82d945cda9b5a52f0fa437.tar.gz | |
Merge commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c'
* commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c':
avcodec: Suppress deprecation warnings from avcodec_alloc_frame()
Conflicts:
libavcodec/utils.c
No change as we dont call this deprecated function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions