diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:30:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:30:19 +0100 |
| commit | fa92ee821bba1d3c2a497ed22e41927b552856f8 (patch) | |
| tree | 26bb0752049f1abb82e03e127f175ff2c0b78387 /libavformat | |
| parent | 905e7eb41389e4394e9c6e459b7d1a99dc30b075 (diff) | |
| parent | 63d744e2be39466e3a734c2987cd713e0bac101e (diff) | |
| download | ffmpeg-streaming-fa92ee821bba1d3c2a497ed22e41927b552856f8.zip ffmpeg-streaming-fa92ee821bba1d3c2a497ed22e41927b552856f8.tar.gz | |
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')
| -rw-r--r-- | libavformat/mpegts.c | 2 | ||||
| -rw-r--r-- | libavformat/oggparseskeleton.c | 4 | ||||
| -rw-r--r-- | libavformat/spdifdec.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 391bf58..8be9a32 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1164,7 +1164,7 @@ static int parse_MP4SLDescrTag(MP4DescrParseContext *d, int64_t off, int len) descr->sl.au_seq_num_len = (lengths >> 7) & 0x1f; descr->sl.packet_seq_num_len = (lengths >> 2) & 0x1f; } else { - av_log_missing_feature(d->s, "Predefined SLConfigDescriptor", 0); + avpriv_report_missing_feature(d->s, "Predefined SLConfigDescriptor"); } return 0; } diff --git a/libavformat/oggparseskeleton.c b/libavformat/oggparseskeleton.c index b6959a6..307387d 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) { diff --git a/libavformat/spdifdec.c b/libavformat/spdifdec.c index e1329cc..36fe4ba 100644 --- a/libavformat/spdifdec.c +++ b/libavformat/spdifdec.c @@ -218,7 +218,7 @@ int ff_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); + avpriv_report_missing_feature(s, "Codec change in IEC 61937"); return AVERROR_PATCHWELCOME; } |
