summaryrefslogtreecommitdiff
path: root/libavcodec/vima.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-27 22:21:19 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-27 22:50:18 +0200
commit444e9874a75c821ad4a1b487559ee8ca1c999712 (patch)
tree5af1c819bca54f7e8cc3bd71946a0afd823c06fd /libavcodec/vima.c
parent94d68a41fabb55dd8c7e59b88fe4a28a637d1e5f (diff)
parentdef97856de6021965db86c25a732d78689bd6bb0 (diff)
downloadffmpeg-444e9874a75c821ad4a1b487559ee8ca1c999712.tar.gz
Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'
* commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/vima.c')
-rw-r--r--libavcodec/vima.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vima.c b/libavcodec/vima.c
index 74d6a9a184..7800c6651b 100644
--- a/libavcodec/vima.c
+++ b/libavcodec/vima.c
@@ -214,7 +214,7 @@ AVCodec ff_adpcm_vima_decoder = {
.id = AV_CODEC_ID_ADPCM_VIMA,
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#if FF_API_VIMA_DECODER
@@ -225,6 +225,6 @@ AVCodec ff_vima_decoder = {
.id = AV_CODEC_ID_ADPCM_VIMA,
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif