avcodec/dump_extradata_bsf: Add back 'k' and 'e' options

[ffmpeg] / libavdevice / caca.c

diff --git a/libavdevice/caca.c b/libavdevice/caca.c
index 75adc354dc9b8dcc82d1ce045509f230873f61cb..93cc0ffd252e9cf50ee1cc757df1f431f20eaa57 100644 (file)
--- a/libavdevice/caca.c
+++ b/libavdevice/caca.c
@@ -92,7 +92,7 @@ static int caca_write_header(AVFormatContext *s)
 {
     CACAContext *c = s->priv_data;
     AVStream *st = s->streams[0];
-    AVCodecContext *encctx = st->codec;
+    AVCodecParameters *encctx = st->codecpar;
     int ret, bpp;
 
     c->ctx = s;
@@ -126,10 +126,10 @@ static int caca_write_header(AVFormatContext *s)
         return AVERROR(EINVAL);
     }
 
-    if (encctx->pix_fmt != AV_PIX_FMT_RGB24) {
+    if (encctx->format != AV_PIX_FMT_RGB24) {
         av_log(s, AV_LOG_ERROR,
                "Unsupported pixel format '%s', choose rgb24\n",
-               av_get_pix_fmt_name(encctx->pix_fmt));
+               av_get_pix_fmt_name(encctx->format));
         return AVERROR(EINVAL);
     }
 
@@ -140,7 +140,7 @@ static int caca_write_header(AVFormatContext *s)
         goto fail;
     }
 
-    bpp = av_get_bits_per_pixel(av_pix_fmt_desc_get(encctx->pix_fmt));
+    bpp = av_get_bits_per_pixel(av_pix_fmt_desc_get(encctx->format));
     c->dither = caca_create_dither(bpp, encctx->width, encctx->height,
                                    bpp / 8 * encctx->width,
                                    0x0000ff, 0x00ff00, 0xff0000, 0);