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/rtpdec_latm.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/rtpdec_latm.c')
-rw-r--r-- | libavformat/rtpdec_latm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtpdec_latm.c b/libavformat/rtpdec_latm.c index bacc186c49..a2ad07104a 100644 --- a/libavformat/rtpdec_latm.c +++ b/libavformat/rtpdec_latm.c @@ -157,8 +157,8 @@ static int parse_fmtp(AVStream *stream, PayloadContext *data, } else if (!strcmp(attr, "cpresent")) { int cpresent = atoi(value); if (cpresent != 0) - av_log_missing_feature(NULL, "RTP MP4A-LATM with in-band " - "configuration", 1); + avpriv_request_sample(NULL, + "RTP MP4A-LATM with in-band configuration"); } return 0; |