diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-11 01:19:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-11 01:26:07 +0200 |
| commit | 1de8a4f7366540df307841b2688dd361c0e32a06 (patch) | |
| tree | 5bef9a96cc65595247f34353ac211b66835584ca /tests/utils.c | |
| parent | 268b1eae227660a7778edaf5345750d18bca4018 (diff) | |
| parent | a7448064c526f097a47355e2ddb7722a06eeb5e3 (diff) | |
| download | ffmpeg-1de8a4f7366540df307841b2688dd361c0e32a06.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mp2: Do not force a samplerate
Conflicts:
libavcodec/mpegaudioenc_template.c
Only libtwolame changes, as the forcing of a sample rate was not merged for the native mp2 encoder
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/utils.c')
0 files changed, 0 insertions, 0 deletions