Change aac and ac3 parsers to use ff_combine_frame().

[ffmpeg] / libavcodec / vp56data.h

diff --git a/libavcodec/vp56data.h b/libavcodec/vp56data.h
index 4fcdcc18f89f848380ff608db5251c205de7eead..0dd79b06b1fddb7ea393d20ca631c06ef282522e 100644 (file)
--- a/libavcodec/vp56data.h
+++ b/libavcodec/vp56data.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef VP56DATA_H
-#define VP56DATA_H
+#ifndef FFMPEG_VP56DATA_H
+#define FFMPEG_VP56DATA_H
 
 #include "common.h"
 
@@ -30,7 +30,9 @@ typedef enum {
     VP56_FRAME_CURRENT  = 0,
     VP56_FRAME_PREVIOUS = 1,
     VP56_FRAME_GOLDEN   = 2,
-    VP56_FRAME_UNUSED   = 3,
+    VP56_FRAME_GOLDEN2  = 3,
+    VP56_FRAME_UNUSED   = 4,
+    VP56_FRAME_UNUSED2  = 5,
 } vp56_frame_t;
 
 typedef enum {
@@ -246,4 +248,4 @@ static const int8_t vp56_candidate_predictor_pos[12][2] = {
     {  2, -2 },
 };
 
-#endif /* VP56DATA */
+#endif /* FFMPEG_VP56DATA_H */