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/mpegts.c | |
| parent | fa92ee821bba1d3c2a497ed22e41927b552856f8 (diff) | |
| parent | 1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e (diff) | |
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/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 8be9a32d8a..d413d54fd6 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1388,7 +1388,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type } if (st->codec->extradata) { if (st->codec->extradata_size == 4 && memcmp(st->codec->extradata, *pp, 4)) - av_log_ask_for_sample(fc, "DVB sub with multiple IDs\n"); + avpriv_request_sample(fc, "DVB sub with multiple IDs"); } else { st->codec->extradata = av_malloc(4 + FF_INPUT_BUFFER_PADDING_SIZE); if (st->codec->extradata) { |