diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 04:31:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 04:32:05 +0100 |
| commit | 16ddc58bd7a2f98b47fb2597a2b349d0aba82da4 (patch) | |
| tree | 46f0b63bd1c9d5bd3970920226c12accc45845fb /libavcodec/avcodec.h | |
| parent | 03e4c2d8333d46c598856f218d9dfeb9316266d8 (diff) | |
| parent | 70daeacd6ef8b354dd7d2d77ad393831a5bbf033 (diff) | |
| download | ffmpeg-16ddc58bd7a2f98b47fb2597a2b349d0aba82da4.tar.gz | |
Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033'
* commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033':
PAF demuxer and decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/paf.c
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/paf.c
libavformat/version.h
See: 7de4a16508cb9bd2d40855f7114dea14329ef62a, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0d497e7754..e8354dd6a4 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -288,6 +288,7 @@ enum AVCodecID { AV_CODEC_ID_FIC, AV_CODEC_ID_ALIAS_PIX, AV_CODEC_ID_BRENDER_PIX_DEPRECATED, + AV_CODEC_ID_PAF_VIDEO_DEPRECATED, AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'), AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), @@ -474,6 +475,7 @@ enum AVCodecID { AV_CODEC_ID_COMFORT_NOISE, AV_CODEC_ID_TAK_DEPRECATED, AV_CODEC_ID_METASOUND, + AV_CODEC_ID_PAF_AUDIO_DEPRECATED, AV_CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'), AV_CODEC_ID_SONIC = MKBETAG('S','O','N','C'), AV_CODEC_ID_SONIC_LS = MKBETAG('S','O','N','L'), |