diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 17:00:27 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 17:00:27 +0400 |
commit | 35ce42e07029b3af62f652a53719fee99bb7a5aa (patch) | |
tree | 455a7ab81008cbbfa9cd3c14468c2b28f2bd6206 /libavformat/spdifdec.c | |
parent | d0ac26a264e5b9d5d7d19efddd7205faf1e124d4 (diff) | |
parent | 8b8899ac3233b4f7af83ded0dc032fad8902d714 (diff) |
Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'
* commit '8b8899ac3233b4f7af83ded0dc032fad8902d714':
fate: Declare avcodec/avformat deps in the respective Makefile snippets
fate: Add dependencies for WMA and WavPack tests
Improve wording and spelling of av_log_missing_feature messages.
lavu: remove disabled FF_API_AV_FIFO_PEEK cruft
Conflicts:
libavcodec/aacsbr.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/spdifdec.c')
-rw-r--r-- | libavformat/spdifdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/spdifdec.c b/libavformat/spdifdec.c index ad138abb13..94cfe8443d 100644 --- a/libavformat/spdifdec.c +++ b/libavformat/spdifdec.c @@ -213,7 +213,7 @@ static int spdif_read_packet(AVFormatContext *s, AVPacket *pkt) st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_id = codec_id; } else if (codec_id != s->streams[0]->codec->codec_id) { - av_log_missing_feature(s, "codec change in IEC 61937", 0); + av_log_missing_feature(s, "Codec change in IEC 61937", 0); return AVERROR_PATCHWELCOME; } |