virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2014-04-11 01:19:51 +02:00
commit 1de8a4f736
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/libtwolame.c
View File

@ -191,7 +191,6 @@ static const AVClass twolame_class = {
static const AVCodecDefault twolame_defaults[] = { static const AVCodecDefault twolame_defaults[] = {
{ "b", "384000" }, { "b", "384000" },
{ "ar", "48000" },
{ NULL }, { NULL },
}; };