diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-30 06:39:57 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-30 06:46:08 +0200 |
commit | faba79e0800ded6285e2cf75622fa42077e781f4 (patch) | |
tree | cc57a187242b52fcde696caf65571b411ab5d392 /libavcodec/pcm-mpeg.c | |
parent | d9c23a0d5a56488b146eef17a19a9b47643be333 (diff) | |
parent | 1f6f58d5855288492fc2640a9f1035c01c75d356 (diff) | |
download | ffmpeg-streaming-faba79e0800ded6285e2cf75622fa42077e781f4.zip ffmpeg-streaming-faba79e0800ded6285e2cf75622fa42077e781f4.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
H.264: tweak some other x86 asm for Atom
probe: Fix insane flow control.
mpegts: remove invalid error check
s302m: use nondeprecated audio sample format API
lavc: use designated initialisers for all codecs.
x86: cabac: add operand size suffixes missing from 6c32576
Conflicts:
libavcodec/ac3enc_float.c
libavcodec/flacenc.c
libavcodec/frwu.c
libavcodec/pictordec.c
libavcodec/qtrleenc.c
libavcodec/v210enc.c
libavcodec/wmv2dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pcm-mpeg.c')
-rw-r--r-- | libavcodec/pcm-mpeg.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libavcodec/pcm-mpeg.c b/libavcodec/pcm-mpeg.c index 0305075..1e8a39e 100644 --- a/libavcodec/pcm-mpeg.c +++ b/libavcodec/pcm-mpeg.c @@ -297,14 +297,10 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, } AVCodec ff_pcm_bluray_decoder = { - "pcm_bluray", - AVMEDIA_TYPE_AUDIO, - CODEC_ID_PCM_BLURAY, - 0, - NULL, - NULL, - NULL, - pcm_bluray_decode_frame, + .name = "pcm_bluray", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_PCM_BLURAY, + .decode = pcm_bluray_decode_frame, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for Blu-ray media"), |