Merge commit 'fe27792fd779ac4cdd5e57be5f6f488483c307b2'

* commit 'fe27792fd779ac4cdd5e57be5f6f488483c307b2':
  build: Move ff_mpeg12_frame_rate_tab to a separate file

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/Makefile
index 4aa07878e55e01a23ca5b58fa59125ed1759b797,55a8f2d8e195457dc73ab32b1e0aec82c5c7fc5b..66ef2ac02c0f36bd03e50ce18eec8652aaaf4d9c
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -34,9 -26,9 +34,10 @@@ OBJS = allcodecs.
         dirac.o                                                          \
         dv_profile.o                                                     \
         imgconvert.o                                                     \
 -       log2_tab.o                                                       \
 +       jni.o                                                            \
         mathtables.o                                                     \
 +       mediacodec.o                                                     \
+        mpeg12framerate.o                                                \
         options.o                                                        \
         parser.o                                                         \
         profiles.o                                                       \
@@@ -217,30 -174,22 +218,29 @@@ OBJS-$(CONFIG_BMV_VIDEO_DECODER)       
  OBJS-$(CONFIG_BRENDER_PIX_DECODER)     += brenderpix.o
  OBJS-$(CONFIG_C93_DECODER)             += c93.o
  OBJS-$(CONFIG_CAVS_DECODER)            += cavs.o cavsdec.o cavsdsp.o \
--                                          cavsdata.o mpeg12data.o
++                                          cavsdata.o
 +OBJS-$(CONFIG_CCAPTION_DECODER)        += ccaption_dec.o
  OBJS-$(CONFIG_CDGRAPHICS_DECODER)      += cdgraphics.o
  OBJS-$(CONFIG_CDXL_DECODER)            += cdxl.o
 +OBJS-$(CONFIG_CFHD_DECODER)            += cfhd.o cfhddata.o
  OBJS-$(CONFIG_CINEPAK_DECODER)         += cinepak.o
 +OBJS-$(CONFIG_CINEPAK_ENCODER)         += cinepakenc.o elbg.o
  OBJS-$(CONFIG_CLJR_DECODER)            += cljrdec.o
  OBJS-$(CONFIG_CLJR_ENCODER)            += cljrenc.o
  OBJS-$(CONFIG_CLLC_DECODER)            += cllc.o canopus.o
  OBJS-$(CONFIG_COMFORTNOISE_DECODER)    += cngdec.o celp_filters.o
  OBJS-$(CONFIG_COMFORTNOISE_ENCODER)    += cngenc.o
  OBJS-$(CONFIG_COOK_DECODER)            += cook.o
 +OBJS-$(CONFIG_CPIA_DECODER)            += cpia.o
  OBJS-$(CONFIG_CSCD_DECODER)            += cscd.o
  OBJS-$(CONFIG_CYUV_DECODER)            += cyuv.o
 -OBJS-$(CONFIG_DCA_DECODER)             += dcadec.o dca.o dcadsp.o      \
 -                                          dcadata.o dca_exss.o         \
 -                                          dca_xll.o synth_filter.o
 +OBJS-$(CONFIG_DCA_DECODER)             += dcadec.o dca.o dcadata.o dcahuff.o \
 +                                          dca_core.o dca_exss.o dca_xll.o dca_lbr.o \
 +                                          dcadsp.o dcadct.o synth_filter.o
 +OBJS-$(CONFIG_DCA_ENCODER)             += dcaenc.o dca.o dcadata.o
  OBJS-$(CONFIG_DDS_DECODER)             += dds.o
-                                           dirac_arith.o mpeg12data.o dirac_dwt.o \
-                                           dirac_vlc.o
 +OBJS-$(CONFIG_DIRAC_DECODER)           += diracdec.o dirac.o diracdsp.o diractab.o \
++                                          dirac_arith.o dirac_dwt.o dirac_vlc.o
  OBJS-$(CONFIG_DFA_DECODER)             += dfa.o
  OBJS-$(CONFIG_DNXHD_DECODER)           += dnxhddec.o dnxhddata.o
  OBJS-$(CONFIG_DNXHD_ENCODER)           += dnxhdenc.o dnxhddata.o

diff --cc libavcodec/mpeg12data.c
index 416bbb8129b54c5851443e4ff85304eb3cf5978d,acb2bc3bb20202305561c563bac98188d0dbf128..4da96d7da3f27f4b08b4c28d4389565fa83fd82d
--- 1/libavcodec/mpeg12data.c
--- 2/libavcodec/mpeg12data.c
+++ b/libavcodec/mpeg12data.c
@@@ -305,92 -305,6 +305,72 @@@ const uint8_t ff_mpeg12_mbMotionVectorT
  { 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 AVRational ff_mpeg2_frame_rate_tab[] = {
 +    {      1,     1},
 +    {      2,     1},
 +    {      3,     1},
 +    {      4,     1},
 +    {      5,     1},
 +    {      6,     1},
 +    {      8,     1},
 +    {      9,     1},
 +    {     10,     1},
 +    {     12,     1},
 +    {     15,     1},
 +    {     16,     1},
 +    {     18,     1},
 +    {     20,     1},
 +    {     24,     1},
 +    {     25,     1},
 +    {     30,     1},
 +    {     32,     1},
 +    {     36,     1},
 +    {     40,     1},
 +    {     45,     1},
 +    {     48,     1},
 +    {     50,     1},
 +    {     60,     1},
 +    {     72,     1},
 +    {     75,     1},
 +    {     80,     1},
 +    {     90,     1},
 +    {     96,     1},
 +    {    100,     1},
 +    {    120,     1},
 +    {    150,     1},
 +    {    180,     1},
 +    {    200,     1},
 +    {    240,     1},
 +    {    750,  1001},
 +    {    800,  1001},
 +    {    960,  1001},
 +    {   1000,  1001},
 +    {   1200,  1001},
 +    {   1250,  1001},
 +    {   1500,  1001},
 +    {   1600,  1001},
 +    {   1875,  1001},
 +    {   2000,  1001},
 +    {   2400,  1001},
 +    {   2500,  1001},
 +    {   3000,  1001},
 +    {   3750,  1001},
 +    {   4000,  1001},
 +    {   4800,  1001},
 +    {   5000,  1001},
 +    {   6000,  1001},
 +    {   7500,  1001},
 +    {   8000,  1001},
 +    {  10000,  1001},
 +    {  12000,  1001},
 +    {  15000,  1001},
 +    {  20000,  1001},
 +    {  24000,  1001},
 +    {  30000,  1001},
 +    {  60000,  1001},
 +    {      0,     0},
 +};
 +
  const float ff_mpeg1_aspect[16]={
      0.0000,
      1.0000,

diff --cc libavcodec/mpeg12framerate.c
index 0000000000000000000000000000000000000000,b11dd5e01d149de22e5d77c0552f8650a8ecaf94..094cd180a5f6e048123e948f493e6a22a4b93d30
mode 000000,100644..100644
--- /dev/null
--- 2/libavcodec/mpeg12framerate.c
+++ b/libavcodec/mpeg12framerate.c
@@@ -1,0 -1,39 +1,39 @@@
 - * This file is part of Libav.
+ /*
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * 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.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * 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
+  */
+ 
+ #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},
+ };