diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-31 22:41:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-31 22:41:00 +0200 |
| commit | d1dad7c824c14939a0e18fa262f3e51957de6e3e (patch) | |
| tree | 615f6ba80611f53e520d2ae479d9d4409077a78d /libavdevice | |
| parent | d2ca5dd0f33b0fdbb5d2a7429c8f71ff1dffffb7 (diff) | |
| parent | f2ed006c90ccb65cd143d8b0fcfc28ffb98c4289 (diff) | |
| download | ffmpeg-d1dad7c824c14939a0e18fa262f3e51957de6e3e.tar.gz | |
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 'libavdevice')
| -rw-r--r-- | libavdevice/oss_audio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c index 531d0b6225..f8843a37f9 100644 --- a/libavdevice/oss_audio.c +++ b/libavdevice/oss_audio.c @@ -296,7 +296,7 @@ static const AVClass oss_demuxer_class = { AVInputFormat ff_oss_demuxer = { .name = "oss", - .long_name = NULL_IF_CONFIG_SMALL("Open Sound System capture"), + .long_name = NULL_IF_CONFIG_SMALL("OSS (Open Sound System) capture"), .priv_data_size = sizeof(AudioData), .read_header = audio_read_header, .read_packet = audio_read_packet, @@ -309,7 +309,7 @@ AVInputFormat ff_oss_demuxer = { #if CONFIG_OSS_OUTDEV AVOutputFormat ff_oss_muxer = { .name = "oss", - .long_name = NULL_IF_CONFIG_SMALL("Open Sound System playback"), + .long_name = NULL_IF_CONFIG_SMALL("OSS (Open Sound System) playback"), .priv_data_size = sizeof(AudioData), /* XXX: we make the assumption that the soundcard accepts this format */ /* XXX: find better solution with "preinit" method, needed also in |