Move DECODE_BYTES_PAD* macros before Doxygen comments.

[ffmpeg] / libavcodec / mpeg12.h

diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h
index 662e3b38f8ecec88870e5d96304d8eaff3fd21ac..30bb675d354fd1b361e4d4df4f5ab2c78bb402c6 100644 (file)
--- a/libavcodec/mpeg12.h
+++ b/libavcodec/mpeg12.h
@@ -19,13 +19,43 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_MPEG12_H
-#define FFMPEG_MPEG12_H
+#ifndef AVCODEC_MPEG12_H
+#define AVCODEC_MPEG12_H
 
 #include "mpegvideo.h"
 
+#define DC_VLC_BITS 9
+#define TEX_VLC_BITS 9
+
+static VLC dc_lum_vlc;
+static VLC dc_chroma_vlc;
+
 extern uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
 
 void ff_mpeg12_common_init(MpegEncContext *s);
+void ff_mpeg12_init_vlcs(void);
+
+static inline int decode_dc(GetBitContext *gb, int component)
+{
+    int code, diff;
+
+    if (component == 0) {
+        code = get_vlc2(gb, dc_lum_vlc.table, DC_VLC_BITS, 2);
+    } else {
+        code = get_vlc2(gb, dc_chroma_vlc.table, DC_VLC_BITS, 2);
+    }
+    if (code < 0){
+        av_log(NULL, AV_LOG_ERROR, "invalid dc code at\n");
+        return 0xffff;
+    }
+    if (code == 0) {
+        diff = 0;
+    } else {
+        diff = get_xbits(gb, code);
+    }
+    return diff;
+}
+
+extern int ff_mpeg1_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
 
-#endif /* FFMPEG_MPEG12_H */
+#endif /* AVCODEC_MPEG12_H */