diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 14:27:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 14:31:01 +0200 |
| commit | ed0aed09e8a19d255963c21c7aeda18cee3d9422 (patch) | |
| tree | 59457517f96fdcd372f73da491372314a3d158d6 /libavcodec/avcodec.h | |
| parent | 849bb62c2c9afdb1e81f44870645a6990c4ce1fc (diff) | |
| parent | 350914fc8024612f614c0a4f5c8ba5da2d9988e7 (diff) | |
| download | ffmpeg-ed0aed09e8a19d255963c21c7aeda18cee3d9422.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Escape 130 (RPL) decoder
Conflicts:
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/codec_desc.c
libavcodec/escape130.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7a0f9e49f0..e959811dc9 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -271,6 +271,7 @@ enum AVCodecID { AV_CODEC_ID_MSS2, AV_CODEC_ID_VP9, AV_CODEC_ID_AIC, + AV_CODEC_ID_ESCAPE130_DEPRECATED, AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'), AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), |