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 /libavcodec/cavsdec.c | |
| 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 'libavcodec/cavsdec.c')
| -rw-r--r-- | libavcodec/cavsdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 4d0bf90..2ef3eb3 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1101,7 +1101,8 @@ static int decode_seq_header(AVSContext *h) width = get_bits(&h->gb, 14); height = get_bits(&h->gb, 14); if ((h->width || h->height) && (h->width != width || h->height != height)) { - av_log_missing_feature(h->avctx, "Width/height changing in CAVS", 0); + avpriv_report_missing_feature(h->avctx, + "Width/height changing in CAVS"); return AVERROR_PATCHWELCOME; } if (width <= 0 || height <= 0) { |
