diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 21:03:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 21:09:17 +0100 |
| commit | f392949f1ac799ad1d7c1cda66e41c1670022d5a (patch) | |
| tree | e3b97d59c99dfc21cf92abb7b71305f4e59f408a /libavcodec/utils.c | |
| parent | 68014c6ed98b5c90f4dc211429dd269ac727be4b (diff) | |
| parent | ae17878fb2ab100264226c84c58f5b95a703312f (diff) | |
| download | ffmpeg-f392949f1ac799ad1d7c1cda66e41c1670022d5a.tar.gz | |
Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f'
* commit 'ae17878fb2ab100264226c84c58f5b95a703312f':
BRender PIX image decoder
Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/version.h
See: 492a5f835c59ab7c2e347d3579d8bf6148ae0a0, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e7cca9646e..f2bef57f92 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2675,6 +2675,7 @@ static enum AVCodecID remap_deprecated_codec_id(enum AVCodecID id) //This is for future deprecatec codec ids, its empty since //last major bump but will fill up again over time, please don't remove it // case AV_CODEC_ID_UTVIDEO_DEPRECATED: return AV_CODEC_ID_UTVIDEO; + case AV_CODEC_ID_BRENDER_PIX_DEPRECATED: return AV_CODEC_ID_BRENDER_PIX; case AV_CODEC_ID_OPUS_DEPRECATED: return AV_CODEC_ID_OPUS; case AV_CODEC_ID_TAK_DEPRECATED : return AV_CODEC_ID_TAK; case AV_CODEC_ID_PCM_S24LE_PLANAR_DEPRECATED : return AV_CODEC_ID_PCM_S24LE_PLANAR; |