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)
* 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>
1  2 
libavcodec/libtwolame.c

Simple merge