Revert "g729: Merge g729.h into g729dec.c."

This reverts commit a2077b85da5bf71167b11925aabbb738558a134d.

diff --git a/libavcodec/g729.h b/libavcodec/g729.h
new file mode 100644 (file)
index 0000000..462cf8f
--- /dev/null
+++ b/libavcodec/g729.h
@@ -0,0 +1,29 @@
+/*
+ * G.729 decoder
+ * Copyright (c) 2008 Vladimir Voroshilov
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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,
+ * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#ifndef AVCODEC_G729_H
+#define AVCODEC_G729_H
+
+/**
+ * subframe size
+ */
+#define SUBFRAME_SIZE 40
+
+#endif // AVCODEC_G729_H

diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index c4a883f39296ffe5e81163719a08ce92634e7cce..28dbad59030734d5c93ab27d1c5f11ac03b8b000 100644 (file)
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -30,6 +30,7 @@
 #include "libavutil/avutil.h"
 #include "get_bits.h"
 
+#include "g729.h"
 #include "lsp.h"
 #include "celp_math.h"
 #include "acelp_filters.h"
@@ -70,12 +71,6 @@
  */
 #define SHARP_MAX                  13017
 
-/**
- * subframe size
- */
-#define SUBFRAME_SIZE              40
-
-
 typedef struct {
     uint8_t ac_index_bits[2];   ///< adaptive codebook index for second subframe (size in bits)
     uint8_t parity_bit;         ///< parity bit for pitch delay