diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 15:53:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 15:54:18 +0100 |
| commit | 3a7ef8dc44abe3b8f58cbf69acfd361287c12f2b (patch) | |
| tree | 039f7c840093da78f566977fd6def1139ddb5839 /libavcodec/utils.c | |
| parent | 64e174e8b8975e36827a84c6d9adb6f161bc734f (diff) | |
| parent | 57231e4d5b467833fb289439cd35a92513bb55c1 (diff) | |
| download | ffmpeg-streaming-3a7ef8dc44abe3b8f58cbf69acfd361287c12f2b.zip ffmpeg-streaming-3a7ef8dc44abe3b8f58cbf69acfd361287c12f2b.tar.gz | |
Merge commit '57231e4d5b467833fb289439cd35a92513bb55c1'
* commit '57231e4d5b467833fb289439cd35a92513bb55c1':
tak: demuxer, parser, and decoder
Not merged as requested by Author and Maintainer of tak in FFmpeg.
I just merged a few typo fixes and minor cosmetic improvments.
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/tak.c
libavcodec/tak.h
libavcodec/tak_parser.c
libavcodec/takdec.c
libavcodec/version.h
libavformat/takdec.c
libavformat/version.h
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 3d33f85..d7b3f18 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1917,6 +1917,7 @@ static enum AVCodecID remap_deprecated_codec_id(enum AVCodecID id) //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_OPUS_DEPRECATED: return AV_CODEC_ID_OPUS; + case AV_CODEC_ID_TAK_DEPRECATED : return AV_CODEC_ID_TAK; default : return id; } } |
