Define POW_SF2_ZERO in aac.h and use for ff_aac_pow2sf_tabp[] offsets instead

[ffmpeg] / libavcodec / mpeg12.h

diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h
index d2ab6e774ac1167f1196661ecbd9ab045260a59a..4c557261608832e3d3478b610b7bc635c23bfb31 100644 (file)
--- a/libavcodec/mpeg12.h
+++ b/libavcodec/mpeg12.h
@@ -2,47 +2,47 @@
  * MPEG1/2 common code
  * Copyright (c) 2007 Aurelien Jacobs <aurel@gnuage.org>
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * 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 VLC ff_dc_lum_vlc;
+extern VLC ff_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_init_vlcs(void);
+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);
+        code = get_vlc2(gb, ff_dc_lum_vlc.table, DC_VLC_BITS, 2);
     } else {
-        code = get_vlc2(gb, dc_chroma_vlc.table, DC_VLC_BITS, 2);
+        code = get_vlc2(gb, ff_dc_chroma_vlc.table, DC_VLC_BITS, 2);
     }
     if (code < 0){
         av_log(NULL, AV_LOG_ERROR, "invalid dc code at\n");
@@ -56,4 +56,6 @@ static inline int decode_dc(GetBitContext *gb, int component)
     return diff;
 }
 
-#endif /* FFMPEG_MPEG12_H */
+extern int ff_mpeg1_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
+
+#endif /* AVCODEC_MPEG12_H */