avcodec: set AV_CODEC_CAP_CHANNEL_CONF on decoders which set their own channels

[ffmpeg] / libavcodec / vc2enc.c

diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c
index cd25884a63e33dac976c3aa9f16f8653b0015c74..bab9d0f3d55904083caaef5e656c3d639f0262cd 100644 (file)
--- a/libavcodec/vc2enc.c
+++ b/libavcodec/vc2enc.c
@@ -234,7 +234,7 @@ static void encode_parse_info(VC2EncContext *s, enum DiracParseCodes pcode)
     cur_pos = put_bits_count(&s->pb) >> 3;
 
     /* Magic string */
-    avpriv_put_string(&s->pb, "BBCD", 0);
+    ff_put_string(&s->pb, "BBCD", 0);
 
     /* Parse code */
     put_bits(&s->pb, 8, pcode);
@@ -931,7 +931,7 @@ static int encode_frame(VC2EncContext *s, AVPacket *avpkt, const AVFrame *frame,
     /* Encoder version */
     if (aux_data) {
         encode_parse_info(s, DIRAC_PCODE_AUX);
-        avpriv_put_string(&s->pb, aux_data, 1);
+        ff_put_string(&s->pb, aux_data, 1);
     }
 
     /* Picture header */