summaryrefslogtreecommitdiff
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2007-08-23 20:28:28 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2007-08-23 20:28:28 +0000
commitb1ec601f7f4d7fd5ae4a17b6efb4471b67c7ee06 (patch)
tree6251796503a731bbdf7074e9b6a4edd05c4ffb5a /libavcodec/avcodec.h
parent0e6b14c2a79c193706a84624e83ba5fcc2308052 (diff)
Add request_channels member to AVCodecContext so we now have a proper
way to tell the decoder how many output channels we would like. Originally committed as revision 10199 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 67d8985c08..11d78b55f3 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -33,8 +33,8 @@
#define AV_STRINGIFY(s) AV_TOSTRING(s)
#define AV_TOSTRING(s) #s
-#define LIBAVCODEC_VERSION_INT ((51<<16)+(41<<8)+0)
-#define LIBAVCODEC_VERSION 51.41.0
+#define LIBAVCODEC_VERSION_INT ((51<<16)+(42<<8)+0)
+#define LIBAVCODEC_VERSION 51.42.0
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
@@ -2123,6 +2123,13 @@ typedef struct AVCodecContext {
* - decoding: unused
*/
int64_t timecode_frame_start;
+
+ /**
+ * Decoder should decode to this many channels if it can (0 for default)
+ * - encoding: unused
+ * - decoding: Set by user.
+ */
+ int request_channels;
} AVCodecContext;
/**