diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-25 16:11:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-25 16:11:34 +0200 |
| commit | abcaacf1acb4c7d7c2df5718fd56a714d4998305 (patch) | |
| tree | e1d7a138ddab9f9863d792719aa349a73f79f2fa /libavcodec/g723_1_data.h | |
| parent | d3ef2da59df2bf65bea0ae7b519625c51c6f21dc (diff) | |
| parent | 7a1a9dd56cb4cafad054bf6d65b21bb24d31c544 (diff) | |
| download | ffmpeg-abcaacf1acb4c7d7c2df5718fd56a714d4998305.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pthread: make sure AVFrame.extended_data is set properly.
libfdk-aac: reindent after last commit
libfdk-aac: Limit to supported sample rates.
cbrt_tablegen: Include libm.h
oggparsetheora: make it more robust
ogg: prevent NULL pointer deference in theora gptopts
Conflicts:
libavformat/oggparsetheora.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g723_1_data.h')
0 files changed, 0 insertions, 0 deletions