diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:00:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:00:27 +0200 |
| commit | 35ce42e07029b3af62f652a53719fee99bb7a5aa (patch) | |
| tree | 455a7ab81008cbbfa9cd3c14468c2b28f2bd6206 /libavformat/oggparseskeleton.c | |
| parent | d0ac26a264e5b9d5d7d19efddd7205faf1e124d4 (diff) | |
| parent | 8b8899ac3233b4f7af83ded0dc032fad8902d714 (diff) | |
| download | ffmpeg-35ce42e07029b3af62f652a53719fee99bb7a5aa.tar.gz | |
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/oggparseskeleton.c')
| -rw-r--r-- | libavformat/oggparseskeleton.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/oggparseskeleton.c b/libavformat/oggparseskeleton.c index d819e0efb1..f9ad701145 100644 --- a/libavformat/oggparseskeleton.c +++ b/libavformat/oggparseskeleton.c @@ -76,7 +76,7 @@ static int skeleton_header(AVFormatContext *s, int idx) start_granule = AV_RL64(buf+36); if (os->start_granule != OGG_NOGRANULE_VALUE) { av_log_missing_feature(s, - "multiple fisbone for the same stream", 0); + "Multiple fisbone for the same stream", 0); return 1; } if (target_idx >= 0 && start_granule != OGG_NOGRANULE_VALUE) { |