Set cur_channel in the AAC encoder context where needed.

[ffmpeg] / libavcodec / wmv2.h

diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h
index 9d43ec547eed2982eb53c86ab77af47eb95d7e51..c69c9f48ee01f9b835c9518082484dd1b660e9f8 100644 (file)
--- a/libavcodec/wmv2.h
+++ b/libavcodec/wmv2.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002 The FFmpeg Project.
+ * Copyright (c) 2002 The FFmpeg Project
  *
  * This file is part of FFmpeg.
  *
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_WMV2_H
-#define FFMPEG_WMV2_H
+#ifndef AVCODEC_WMV2_H
+#define AVCODEC_WMV2_H
 
 #include "avcodec.h"
 #include "dsputil.h"
@@ -50,9 +50,9 @@ typedef struct Wmv2Context{
     int hshift;
 
     ScanTable abt_scantable[2];
-    DECLARE_ALIGNED_16(DCTELEM, abt_block2[6][64]);
+    DECLARE_ALIGNED(16, DCTELEM, abt_block2)[6][64];
 }Wmv2Context;
 
 void ff_wmv2_common_init(Wmv2Context * w);
 
-#endif /* FFMPEG_WMV2_H */
+#endif /* AVCODEC_WMV2_H */