diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-01 13:25:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-01 13:25:46 +0100 |
| commit | 7fd9d49ba7fa57629592b1f7064cb12d96984a14 (patch) | |
| tree | 5e28214b75e917193be3699941069c9bbb43ece4 /libavformat/g723_1.c | |
| parent | add7513e64e6db255e30fba544068ed2ab5e7b3e (diff) | |
| parent | 6b07830a77729fe25c30026feabd53e8c4c5eb9e (diff) | |
| download | ffmpeg-7fd9d49ba7fa57629592b1f7064cb12d96984a14.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add ac3/eac3 tests to FATE_SAMPLES_AVCONV
avconv_opt, cmdutils: Add missing function parameter Doxygen
x86: Move optimization suffix to end of function names
Conflicts:
cmdutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/g723_1.c')
0 files changed, 0 insertions, 0 deletions