libopusdec: default to stereo for invalid number of channels

[ffmpeg] / libavcodec / mpegutils.h

diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h
index 05a5fc202cddacaf6b275b28af49fec3615470a5..60f971222ef521ef95136b303d2a36b5fad6f590 100644 (file)
--- a/libavcodec/mpegutils.h
+++ b/libavcodec/mpegutils.h
@@ -21,8 +21,18 @@
 #ifndef AVCODEC_MPEGUTILS_H
 #define AVCODEC_MPEGUTILS_H
 
+#include <stdint.h>
+
+#include "libavutil/frame.h"
+
+#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
 #define PICT_BOTTOM_FIELD  2
@@ -34,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
@@ -108,4 +120,23 @@
 
 #define CANDIDATE_MB_TYPE_DIRECT0    (1 << 12)
 
-#endif /* AVCODEC_PICTTYPE_H */
+#define INPLACE_OFFSET 16
+
+enum OutputFormat {
+    FMT_MPEG1,
+    FMT_H261,
+    FMT_H263,
+    FMT_MJPEG,
+};
+
+
+/**
+ * Draw a horizontal band if supported.
+ *
+ * @param h is the normal height, this will be reduced automatically if needed
+ */
+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_MPEGUTILS_H */