eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-23 23:40:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
0c06ca7a8ab46df0268d049e7c2067ef29a5f77d
ffmpeg/libavcodec/libtwolame.c
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

8.2 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink