]> git.sesse.net Git - ffmpeg/commitdiff
build: Move ff_mpeg12_frame_rate_tab to a separate file
authorDiego Biurrun <diego@biurrun.de>
Mon, 27 Jun 2016 14:09:00 +0000 (16:09 +0200)
committerDiego Biurrun <diego@biurrun.de>
Wed, 29 Jun 2016 10:31:03 +0000 (12:31 +0200)
It is also used by the Dirac parsing code.

libavcodec/Makefile
libavcodec/mpeg12data.c
libavcodec/mpeg12framerate.c [new file with mode: 0644]

index 0660f96043ac1edac207c54ceaa50cf3bb467f29..55a8f2d8e195457dc73ab32b1e0aec82c5c7fc5b 100644 (file)
@@ -28,6 +28,7 @@ OBJS = allcodecs.o                                                      \
        imgconvert.o                                                     \
        log2_tab.o                                                       \
        mathtables.o                                                     \
+       mpeg12framerate.o                                                \
        options.o                                                        \
        parser.o                                                         \
        profiles.o                                                       \
index 46e797f3c5842da4b01799f4aaead8fab24cdf6c..acb2bc3bb20202305561c563bac98188d0dbf128 100644 (file)
@@ -305,26 +305,6 @@ const uint8_t ff_mpeg12_mbMotionVectorTable[17][2] = {
 { 0xc, 10 },
 };
 
-const AVRational ff_mpeg12_frame_rate_tab[16] = {
-    {    0,    0},
-    {24000, 1001},
-    {   24,    1},
-    {   25,    1},
-    {30000, 1001},
-    {   30,    1},
-    {   50,    1},
-    {60000, 1001},
-    {   60,    1},
-  // Xing's 15fps: (9)
-    {   15,    1},
-  // libmpeg3's "Unofficial economy rates": (10-13)
-    {    5,    1},
-    {   10,    1},
-    {   12,    1},
-    {   15,    1},
-    {    0,    0},
-};
-
 const float ff_mpeg1_aspect[16]={
     0.0000,
     1.0000,
diff --git a/libavcodec/mpeg12framerate.c b/libavcodec/mpeg12framerate.c
new file mode 100644 (file)
index 0000000..b11dd5e
--- /dev/null
@@ -0,0 +1,39 @@
+/*
+ * This file is part of Libav.
+ *
+ * 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.
+ *
+ * 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/rational.h"
+
+const AVRational ff_mpeg12_frame_rate_tab[16] = {
+    {    0,    0},
+    {24000, 1001},
+    {   24,    1},
+    {   25,    1},
+    {30000, 1001},
+    {   30,    1},
+    {   50,    1},
+    {60000, 1001},
+    {   60,    1},
+  // Xing's 15fps: (9)
+    {   15,    1},
+  // libmpeg3's "Unofficial economy rates": (10-13)
+    {    5,    1},
+    {   10,    1},
+    {   12,    1},
+    {   15,    1},
+    {    0,    0},
+};