diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 18:53:56 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 18:54:18 +0400 |
| commit | 3a7ef8dc44abe3b8f58cbf69acfd361287c12f2b (patch) | |
| tree | 039f7c840093da78f566977fd6def1139ddb5839 /libavcodec/avcodec.h | |
| parent | 64e174e8b8975e36827a84c6d9adb6f161bc734f (diff) | |
| parent | 57231e4d5b467833fb289439cd35a92513bb55c1 (diff) | |
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/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 b6a4b0ec24..bbf3381694 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -433,6 +433,7 @@ enum AVCodecID { AV_CODEC_ID_ILBC, AV_CODEC_ID_OPUS_DEPRECATED, AV_CODEC_ID_COMFORT_NOISE, + AV_CODEC_ID_TAK_DEPRECATED, AV_CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'), AV_CODEC_ID_8SVX_RAW = MKBETAG('8','S','V','X'), AV_CODEC_ID_SONIC = MKBETAG('S','O','N','C'), |