diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-17 19:52:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-17 20:12:02 +0200 |
| commit | 78accb876c173c881082018b169b5cf9fa13e6e1 (patch) | |
| tree | 5dbcaf2ae14a012dafaaf418a650d697f3ef8ea4 /libavformat/amr.c | |
| parent | fc096e2e861e821a743bf9c42abee0fb41fff5d6 (diff) | |
| parent | 08e09ed7db732ebc53b8c60d7a39ac0abd49694f (diff) | |
| download | ffmpeg-78accb876c173c881082018b169b5cf9fa13e6e1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ffmpeg: fix some indentation
ffmpeg: fix operation with --disable-avfilter
simple_idct: remove disabled code
motion_est: remove disabled code
vc1: remove disabled code
fate: separate lavf-mxf_d10 test from lavf-mxf
cabac: Move code only used in the cabac test program to cabac.c.
ffplay: warn that -pix_fmt is no longer working, suggest alternative
ffplay: warn that -s is no longer working, suggest alternative
lavf: rename enc variable in utils.c:has_codec_parameters()
lavf: use designated initialisers for all (de)muxers.
wav: remove a use of deprecated AV_METADATA_ macro
rmdec: remove useless ap parameter from rm_read_header_old()
dct-test: remove write-only variable
des: fix #if conditional around P_shuffle
Use LOCAL_ALIGNED in ff_check_alignment()
Conflicts:
ffmpeg.c
libavformat/avidec.c
libavformat/matroskaenc.c
libavformat/mp3enc.c
libavformat/oggenc.c
libavformat/utils.c
tests/ref/lavf/mxf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/amr.c')
| -rw-r--r-- | libavformat/amr.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/libavformat/amr.c b/libavformat/amr.c index 66763f3fa7..373e454519 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -174,27 +174,25 @@ static int amr_read_packet(AVFormatContext *s, #if CONFIG_AMR_DEMUXER AVInputFormat ff_amr_demuxer = { - "amr", - NULL_IF_CONFIG_SMALL("3GPP AMR file format"), - 0, /*priv_data_size*/ - amr_probe, - amr_read_header, - amr_read_packet, - NULL, + .name = "amr", + .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR file format"), + .priv_data_size = 0, /*priv_data_size*/ + .read_probe = amr_probe, + .read_header = amr_read_header, + .read_packet = amr_read_packet, .flags = AVFMT_GENERIC_INDEX, }; #endif #if CONFIG_AMR_MUXER AVOutputFormat ff_amr_muxer = { - "amr", - NULL_IF_CONFIG_SMALL("3GPP AMR file format"), - "audio/amr", - "amr", - 0, - CODEC_ID_AMR_NB, - CODEC_ID_NONE, - amr_write_header, - amr_write_packet, + .name = "amr", + .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR file format"), + .mime_type = "audio/amr", + .extensions = "amr", + .audio_codec = CODEC_ID_AMR_NB, + .video_codec = CODEC_ID_NONE, + .write_header = amr_write_header, + .write_packet = amr_write_packet, }; #endif |