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/mxfdec.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/mxfdec.c')
| -rw-r--r-- | libavformat/mxfdec.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 7dfdbfd2fb..0a81d16762 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -411,8 +411,7 @@ static int mxf_read_primer_pack(void *arg, AVIOContext *pb, int tag, int size, U int item_len = avio_rb32(pb); if (item_len != 18) { - av_log_ask_for_sample(pb, "unsupported primer pack item length %d\n", - item_len); + avpriv_request_sample(pb, "Primer pack item length %d", item_len); return AVERROR_PATCHWELCOME; } if (item_num > 65536) { @@ -2127,9 +2126,11 @@ static int mxf_read_packet_old(AVFormatContext *s, AVPacket *pkt) if (next_ofs >= 0 && next_klv > next_ofs) { /* if this check is hit then it's possible OPAtom was treated as OP1a * truncate the packet since it's probably very large (>2 GiB is common) */ - av_log_ask_for_sample(s, - "KLV for edit unit %i extends into next edit unit - OPAtom misinterpreted as OP1a?\n", - mxf->current_edit_unit); + avpriv_request_sample(s, + "OPAtom misinterpreted as OP1a?" + "KLV for edit unit %i extending into " + "next edit unit", + mxf->current_edit_unit); klv.length = next_ofs - avio_tell(s->pb); } |