aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/proresdec2.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2015-08-17 20:45:35 -0400
committerRonald S. Bultje <rsbultje@gmail.com>2015-08-18 10:24:01 -0400
commit229843aa359ae0c9519977d7fa952688db63f559 (patch)
treef931598935b67d8d9b2a64190876a9b829e1f287 /libavcodec/proresdec2.c
parentad7d972e08dddb1788ac6a434d1be314febcb09d (diff)
downloadffmpeg-229843aa359ae0c9519977d7fa952688db63f559.tar.gz
Replace av_dlog with ff_dlog.
ff_dlog checks compilability, and is non-public. av_dlog is deprecated and no longer exists if FF_API_DLOG=0.
Diffstat (limited to 'libavcodec/proresdec2.c')
-rw-r--r--libavcodec/proresdec2.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c
index 86c7b189f1..932f85f73b 100644
--- a/libavcodec/proresdec2.c
+++ b/libavcodec/proresdec2.c
@@ -28,6 +28,7 @@
#define LONG_BITSTREAM_READER
+#include "libavutil/internal.h"
#include "avcodec.h"
#include "get_bits.h"
#include "idctdsp.h"
@@ -70,14 +71,14 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
const uint8_t *ptr;
hdr_size = AV_RB16(buf);
- av_dlog(avctx, "header size %d\n", hdr_size);
+ ff_dlog(avctx, "header size %d\n", hdr_size);
if (hdr_size > data_size) {
av_log(avctx, AV_LOG_ERROR, "error, wrong header size\n");
return AVERROR_INVALIDDATA;
}
version = AV_RB16(buf + 2);
- av_dlog(avctx, "%.4s version %d\n", buf+4, version);
+ ff_dlog(avctx, "%.4s version %d\n", buf+4, version);
if (version > 1) {
av_log(avctx, AV_LOG_ERROR, "unsupported version: %d\n", version);
return AVERROR_PATCHWELCOME;
@@ -100,7 +101,7 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
}
if (avctx->skip_alpha) ctx->alpha_info = 0;
- av_dlog(avctx, "frame type %d\n", ctx->frame_type);
+ ff_dlog(avctx, "frame type %d\n", ctx->frame_type);
if (ctx->frame_type == 0) {
ctx->scan = ctx->progressive_scan; // permuted
@@ -118,7 +119,7 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
ptr = buf + 20;
flags = buf[19];
- av_dlog(avctx, "flags %x\n", flags);
+ ff_dlog(avctx, "flags %x\n", flags);
if (flags & 2) {
if(buf + data_size - ptr < 64) {