libopusdec: default to stereo for invalid number of channels

[ffmpeg] / libavcodec / mpegutils.h

diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h
index 9446724f30ffa888d6beb9568aeb1b10cb0f3db8..60f971222ef521ef95136b303d2a36b5fad6f590 100644 (file)
--- a/libavcodec/mpegutils.h
+++ b/libavcodec/mpegutils.h
@@ -28,6 +28,10 @@
 #include "avcodec.h"
 #include "version.h"
 
+/**
+ * Return value for header parsers if frame is not coded.
+ * */
+#define FRAME_SKIPPED 100
 
 /* picture type */
 #define PICT_TOP_FIELD     1
@@ -40,6 +44,8 @@
  */
 #define DELAYED_PIC_REF 4
 
+#define MAX_MB_BYTES    (30 * 16 * 16 * 3 / 8 + 120)
+#define MAX_FCODE        7
 
 /* MB types */
 #if !FF_API_MB_TYPE
@@ -114,6 +120,15 @@
 
 #define CANDIDATE_MB_TYPE_DIRECT0    (1 << 12)
 
+#define INPLACE_OFFSET 16
+
+enum OutputFormat {
+    FMT_MPEG1,
+    FMT_H261,
+    FMT_H263,
+    FMT_MJPEG,
+};
+
 
 /**
  * Draw a horizontal band if supported.
@@ -124,4 +139,4 @@ void ff_draw_horiz_band(AVCodecContext *avctx, AVFrame *cur, AVFrame *last,
                         int y, int h, int picture_structure, int first_field,
                         int low_delay);
 
-#endif /* AVCODEC_PICTTYPE_H */
+#endif /* AVCODEC_MPEGUTILS_H */