lavc: remove disabled FF_API_OLD_SAMPLE_FMT cruft.

[ffmpeg] / libavcodec / intrax8.h

diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h
index 2a60328e3cd4893dac21c8321e8fa1dc028a6e0a..3a58938cc32afc5b11f4b76010596f739afbb7cc 100644 (file)
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@ -1,23 +1,26 @@
 /*
- * 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_INTRAX8_H
-#define FFMPEG_INTRAX8_H
+#ifndef AVCODEC_INTRAX8_H
+#define AVCODEC_INTRAX8_H
+
+#include "get_bits.h"
+#include "mpegvideo.h"
 
 typedef struct{
     VLC * j_ac_vlc[4];//they point to the static j_mb_vlc
@@ -48,6 +51,7 @@ typedef struct{
 } IntraX8Context;
 
 void ff_intrax8_common_init(IntraX8Context * w, MpegEncContext * const s);
+void ff_intrax8_common_end(IntraX8Context * w);
 int  ff_intrax8_decode_picture(IntraX8Context * w, int quant, int halfpq);
 
-#endif /* FFMPEG_INTRAX8_H */
+#endif /* AVCODEC_INTRAX8_H */