diff options
| author | wm4 <wm4@nowhere> | 2013-03-09 08:49:56 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-03-13 23:51:30 +0100 |
| commit | d8bde114fd9685111274713c03985c72de3377b1 (patch) | |
| tree | a5bbfbc0423a557e559752d5bd9f5bf957d7415d /video | |
| parent | ba5fc1d5e6c7d0762cd051edc80011faa9ab6a6a (diff) | |
| download | mpv-d8bde114fd9685111274713c03985c72de3377b1.tar.bz2 mpv-d8bde114fd9685111274713c03985c72de3377b1.tar.xz | |
Prefix CODEC_ID_ with AV_
The old names have been deprecated a while ago, but were needed for
supporting older ffmpeg/libav versions. The deprecated identifiers
have been removed from recent Libav and FFmpeg git.
This change breaks compatibility with Libav 0.8.x and equivalent
FFmpeg releases.
Diffstat (limited to 'video')
| -rw-r--r-- | video/image_writer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/video/image_writer.c b/video/image_writer.c index 7802923e15..a65024124e 100644 --- a/video/image_writer.c +++ b/video/image_writer.c @@ -105,7 +105,7 @@ static int write_lavc(struct image_writer_ctx *ctx, mp_image_t *image, FILE *fp) avctx->width = image->w; avctx->height = image->h; avctx->pix_fmt = imgfmt2pixfmt(image->imgfmt); - if (ctx->writer->lavc_codec == CODEC_ID_PNG) + if (ctx->writer->lavc_codec == AV_CODEC_ID_PNG) avctx->compression_level = ctx->opts->png_compression; if (avcodec_open2(avctx, codec, NULL) < 0) { @@ -208,18 +208,18 @@ static int write_jpeg(struct image_writer_ctx *ctx, mp_image_t *image, FILE *fp) #endif static const struct img_writer img_writers[] = { - { "png", write_lavc, .lavc_codec = CODEC_ID_PNG }, - { "ppm", write_lavc, .lavc_codec = CODEC_ID_PPM }, + { "png", write_lavc, .lavc_codec = AV_CODEC_ID_PNG }, + { "ppm", write_lavc, .lavc_codec = AV_CODEC_ID_PPM }, { "pgm", write_lavc, - .lavc_codec = CODEC_ID_PGM, + .lavc_codec = AV_CODEC_ID_PGM, .pixfmts = (int[]) { IMGFMT_Y8, 0 }, }, { "pgmyuv", write_lavc, - .lavc_codec = CODEC_ID_PGMYUV, + .lavc_codec = AV_CODEC_ID_PGMYUV, .pixfmts = (int[]) { IMGFMT_420P, 0 }, }, { "tga", write_lavc, - .lavc_codec = CODEC_ID_TARGA, + .lavc_codec = AV_CODEC_ID_TARGA, .pixfmts = (int[]) { IMGFMT_BGR24, IMGFMT_BGRA, IMGFMT_BGR15_LE, IMGFMT_Y8, 0}, }, |