diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-28 01:50:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-28 01:50:36 +0200 |
| commit | 25d8099beb4c7eb93539f9162af1336ef7130fed (patch) | |
| tree | 4f668222da738409baf5ad8a1ee9d1c9f9004f96 /libavcodec/ac3enc_fixed.c | |
| parent | 57e2ded4234356c26bf92b0a627ec383ea8d288f (diff) | |
| parent | 991f3de1bb696a55f7604e4b7d53492299fe44b5 (diff) | |
| download | ffmpeg-25d8099beb4c7eb93539f9162af1336ef7130fed.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
ac3enc: Add codec-specific options for writing AC-3 metadata.
NOT MERGED: Remove arrozcru URL from documentation
sndio support for playback and record
Conflicts:
doc/faq.texi
doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3enc_fixed.c')
| -rw-r--r-- | libavcodec/ac3enc_fixed.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index f682aa625f..e7942abe99 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -410,5 +410,6 @@ AVCodec ff_ac3_fixed_encoder = { NULL, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), + .priv_class = &ac3enc_class, .channel_layouts = ac3_channel_layouts, }; |