diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 15:30:19 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 15:30:19 +0400 |
commit | fa92ee821bba1d3c2a497ed22e41927b552856f8 (patch) | |
tree | 26bb0752049f1abb82e03e127f175ff2c0b78387 /libavformat/oggparseskeleton.c | |
parent | 905e7eb41389e4394e9c6e459b7d1a99dc30b075 (diff) | |
parent | 63d744e2be39466e3a734c2987cd713e0bac101e (diff) |
Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'
* commit '63d744e2be39466e3a734c2987cd713e0bac101e':
av_log_missing_feature() ---> avpriv_report_missing_feature()
Conflicts:
libavcodec/aacdec.c
libavcodec/tta.c
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparseskeleton.c')
-rw-r--r-- | libavformat/oggparseskeleton.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/oggparseskeleton.c b/libavformat/oggparseskeleton.c index b6959a6543..307387d065 100644 --- a/libavformat/oggparseskeleton.c +++ b/libavformat/oggparseskeleton.c @@ -75,8 +75,8 @@ static int skeleton_header(AVFormatContext *s, int idx) target_idx = ogg_find_stream(ogg, AV_RL32(buf+12)); 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); + avpriv_report_missing_feature(s, + "Multiple fisbone for the same stream"); return 1; } if (target_idx >= 0 && start_granule != OGG_NOGRANULE_VALUE) { |