diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-24 21:32:12 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-24 21:36:26 +0300 |
| commit | 8e2fcd1cb4be938768db74af5c08350df6a156d7 (patch) | |
| tree | 5df0d916c17a7754fc9be8bfeb1938b25148fc31 /libavcodec/avcodec.h | |
| parent | 58d7dde081d1aef2cfa79c3675c54023371d1060 (diff) | |
| parent | 5a79bf0284a37855636390e620d189a964214c9e (diff) | |
Merge commit '5a79bf0284a37855636390e620d189a964214c9e'
* commit '5a79bf0284a37855636390e620d189a964214c9e':
PCM signed 16-bit big-endian planar decoder
Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/pcm.c
libavcodec/version.h
libavformat/nut.c
See: 9ba41ae63e079198ef4a9e83b5fa147e20966bdb
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 3ce33683ab..761d3c1b87 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -358,6 +358,7 @@ enum AVCodecID { AV_CODEC_ID_PCM_S8_PLANAR, AV_CODEC_ID_PCM_S24LE_PLANAR_DEPRECATED, AV_CODEC_ID_PCM_S32LE_PLANAR_DEPRECATED, + AV_CODEC_ID_PCM_S16BE_PLANAR_DEPRECATED, AV_CODEC_ID_PCM_S24LE_PLANAR = MKBETAG(24,'P','S','P'), AV_CODEC_ID_PCM_S32LE_PLANAR = MKBETAG(32,'P','S','P'), AV_CODEC_ID_PCM_S16BE_PLANAR = MKBETAG('P','S','P',16), |