Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / mpegvideo_common.h

diff --git a/libavcodec/mpegvideo_common.h b/libavcodec/mpegvideo_common.h
index 2b2e34ffa9cc16f63409b84e691bb6a213f82df1..2ef83abb8f6c4f6b51c6cd2e382e41b0fe37dd8e 100644 (file)
--- a/libavcodec/mpegvideo_common.h
+++ b/libavcodec/mpegvideo_common.h
@@ -39,19 +39,13 @@
 #include "faandct.h"
 #include <limits.h>
 
-int dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow);
-
-/**
- * Allocate a Picture.
- * The pixels are allocated/set by calling get_buffer() if shared = 0.
- */
-int alloc_picture(MpegEncContext *s, Picture *pic, int shared);
+int ff_dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow);
 
 /**
  * Set the given MpegEncContext to common defaults (same for encoding and decoding).
  * The changed fields will not depend upon the prior state of the MpegEncContext.
  */
-void MPV_common_defaults(MpegEncContext *s);
+void ff_MPV_common_defaults(MpegEncContext *s);
 
 static inline void gmc1_motion(MpegEncContext *s,
                                uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,