1de8a4f736
* 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>
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory in git. You can also view it online at http://ffmpeg.org/documentation.html 2) Licensing ------------ * See the LICENSE file. 3) Build and Install -------------------- * See the INSTALL file.