diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:41:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:41:34 +0100 |
| commit | a9ddb624890dd8c334617239793e63d93fbd52ee (patch) | |
| tree | d1b6919c46a238f1a9c926106cddb0d283badd60 /libavformat/spdifdec.c | |
| parent | fa92ee821bba1d3c2a497ed22e41927b552856f8 (diff) | |
| parent | 1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e (diff) | |
| download | ffmpeg-a9ddb624890dd8c334617239793e63d93fbd52ee.tar.gz | |
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
* commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e':
avformat: av_log_ask_for_sample() ---> avpriv_request_sample()
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/spdifdec.c')
| -rw-r--r-- | libavformat/spdifdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/spdifdec.c b/libavformat/spdifdec.c index 36fe4bac2a..726a85cbe5 100644 --- a/libavformat/spdifdec.c +++ b/libavformat/spdifdec.c @@ -91,8 +91,8 @@ static int spdif_get_offset_and_codec(AVFormatContext *s, break; default: if (s) { /* be silent during a probe */ - av_log(s, AV_LOG_WARNING, "Data type 0x%04x", data_type); - av_log_missing_feature(s, " in IEC 61937", 1); + avpriv_request_sample(s, "Data type 0x%04x in IEC 61937", + data_type); } return AVERROR_PATCHWELCOME; } @@ -184,7 +184,7 @@ int ff_spdif_read_packet(AVFormatContext *s, AVPacket *pkt) pkt_size_bits = avio_rl16(pb); if (pkt_size_bits % 16) - av_log_ask_for_sample(s, "Packet does not end to a 16-bit boundary."); + avpriv_request_sample(s, "Packet not ending at a 16-bit boundary"); ret = av_new_packet(pkt, FFALIGN(pkt_size_bits, 16) >> 3); if (ret) |