Commit f659dbf3 authored by jbr's avatar jbr

Add CH_LAYOUT_NATIVE channel mask value to allow user to request native codec

channel order from the decoder rather than the default FFmpeg channel order.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20508 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 22a9f8a4
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 37 #define LIBAVCODEC_VERSION_MINOR 38
#define LIBAVCODEC_VERSION_MICRO 1 #define LIBAVCODEC_VERSION_MICRO 1
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
...@@ -387,6 +387,11 @@ enum SampleFormat { ...@@ -387,6 +387,11 @@ enum SampleFormat {
#define CH_STEREO_LEFT 0x20000000 ///< Stereo downmix. #define CH_STEREO_LEFT 0x20000000 ///< Stereo downmix.
#define CH_STEREO_RIGHT 0x40000000 ///< See CH_STEREO_LEFT. #define CH_STEREO_RIGHT 0x40000000 ///< See CH_STEREO_LEFT.
/** Channel mask value used for AVCodecContext.request_channel_layout
to indicate that the user requests the channel order of the decoder output
to be the native codec channel order. */
#define CH_LAYOUT_NATIVE 0x8000000000000000LL
/* Audio channel convenience macros */ /* Audio channel convenience macros */
#define CH_LAYOUT_MONO (CH_FRONT_CENTER) #define CH_LAYOUT_MONO (CH_FRONT_CENTER)
#define CH_LAYOUT_STEREO (CH_FRONT_LEFT|CH_FRONT_RIGHT) #define CH_LAYOUT_STEREO (CH_FRONT_LEFT|CH_FRONT_RIGHT)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment