Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Apr 2014 23:19:51 +0000 (01:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Apr 2014 23:26:07 +0000 (01:26 +0200)
commit1de8a4f7366540df307841b2688dd361c0e32a06
tree5bef9a96cc65595247f34353ac211b66835584ca
parent268b1eae227660a7778edaf5345750d18bca4018
parenta7448064c526f097a47355e2ddb7722a06eeb5e3
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>
libavcodec/libtwolame.c