diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-01 00:41:00 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-01 00:41:00 +0400 |
commit | d1dad7c824c14939a0e18fa262f3e51957de6e3e (patch) | |
tree | 615f6ba80611f53e520d2ae479d9d4409077a78d /libavformat/au.c | |
parent | d2ca5dd0f33b0fdbb5d2a7429c8f71ff1dffffb7 (diff) | |
parent | f2ed006c90ccb65cd143d8b0fcfc28ffb98c4289 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpc8: return more meaningful error codes.
mpc: return more meaningful error codes.
wv,mpc8: don't return apetag data in packets.
rtmp: do not warn about receiving metadata packets
x86: h264dsp: Adjust YASM #ifdefs
x86: yadif: Mark mmxext optimizations as such
h264: convert loop filter strength dsp function to yasm.
Improve descriptiveness of a number of codec and container long names
Conflicts:
libavcodec/flvdec.c
libavcodec/libopenjpegdec.c
libavformat/apetag.c
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/au.c')
-rw-r--r-- | libavformat/au.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/au.c b/libavformat/au.c index b78d1ac18e..69d93c6d90 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -195,7 +195,7 @@ static int au_read_packet(AVFormatContext *s, #if CONFIG_AU_DEMUXER AVInputFormat ff_au_demuxer = { .name = "au", - .long_name = NULL_IF_CONFIG_SMALL("SUN AU format"), + .long_name = NULL_IF_CONFIG_SMALL("Sun AU"), .read_probe = au_probe, .read_header = au_read_header, .read_packet = au_read_packet, @@ -207,7 +207,7 @@ AVInputFormat ff_au_demuxer = { #if CONFIG_AU_MUXER AVOutputFormat ff_au_muxer = { .name = "au", - .long_name = NULL_IF_CONFIG_SMALL("SUN AU format"), + .long_name = NULL_IF_CONFIG_SMALL("Sun AU"), .mime_type = "audio/basic", .extensions = "au", .audio_codec = CODEC_ID_PCM_S16BE, |