diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 10:39:50 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 10:46:39 +0100 |
commit | a2bfee36b70bc9a5dd0a5a1cef36ca32bc1fba07 (patch) | |
tree | 01531bd775ded92bdfe25952a27c83655d7fc1c7 /libavcodec/avcodec.h | |
parent | fc5fe4804fd2ee9a29de502e9431b12d027c0c89 (diff) | |
parent | 9af7a8523a6bb517834ebed36093bdab11a8b38e (diff) |
Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'
* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
HNM4/HNM4A demuxer & video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.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 f7be037427..3af8b081cc 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -276,6 +276,7 @@ enum AVCodecID { AV_CODEC_ID_ESCAPE130_DEPRECATED, AV_CODEC_ID_G2M_DEPRECATED, AV_CODEC_ID_WEBP_DEPRECATED, + AV_CODEC_ID_HNM4_VIDEO, AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'), AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), |