summaryrefslogtreecommitdiff
path: root/libavformat/aiffenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-07-17 19:52:05 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-07-17 20:12:02 +0200
commit78accb876c173c881082018b169b5cf9fa13e6e1 (patch)
tree5dbcaf2ae14a012dafaaf418a650d697f3ef8ea4 /libavformat/aiffenc.c
parentfc096e2e861e821a743bf9c42abee0fb41fff5d6 (diff)
parent08e09ed7db732ebc53b8c60d7a39ac0abd49694f (diff)
downloadffmpeg-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/aiffenc.c')
-rw-r--r--libavformat/aiffenc.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c
index 0e6a061fc8..3b2fc38160 100644
--- a/libavformat/aiffenc.c
+++ b/libavformat/aiffenc.c
@@ -155,15 +155,15 @@ static int aiff_write_trailer(AVFormatContext *s)
}
AVOutputFormat ff_aiff_muxer = {
- "aiff",
- NULL_IF_CONFIG_SMALL("Audio IFF"),
- "audio/aiff",
- "aif,aiff,afc,aifc",
- sizeof(AIFFOutputContext),
- CODEC_ID_PCM_S16BE,
- CODEC_ID_NONE,
- aiff_write_header,
- aiff_write_packet,
- aiff_write_trailer,
+ .name = "aiff",
+ .long_name = NULL_IF_CONFIG_SMALL("Audio IFF"),
+ .mime_type = "audio/aiff",
+ .extensions = "aif,aiff,afc,aifc",
+ .priv_data_size = sizeof(AIFFOutputContext),
+ .audio_codec = CODEC_ID_PCM_S16BE,
+ .video_codec = CODEC_ID_NONE,
+ .write_header = aiff_write_header,
+ .write_packet = aiff_write_packet,
+ .write_trailer = aiff_write_trailer,
.codec_tag= (const AVCodecTag* const []){ff_codec_aiff_tags, 0},
};