Files
ffmpeg/libavcodec
Michael Niedermayer 1de8a4f736 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>
2014-04-11 01:26:07 +02:00
..
2014-04-07 23:50:33 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-03-22 03:12:18 +01:00
2014-04-05 03:32:11 +02:00
2014-04-05 03:32:11 +02:00
2014-04-01 05:18:26 +02:00
2014-04-04 04:00:11 +02:00
2014-03-26 04:20:52 +01:00
2014-03-31 01:11:16 +02:00
2014-04-07 23:50:33 +02:00
2014-04-01 13:43:44 +02:00
2014-02-21 16:57:26 -03:00
2014-02-21 16:57:26 -03:00
2014-04-04 04:00:11 +02:00
2014-03-29 18:13:15 +01:00
2014-03-27 23:57:51 +01:00