diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 10:42:36 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 10:42:36 +0100 |
commit | 9b4cc0f35c8123ce9ff505eebb5f3f261dff0bf8 (patch) | |
tree | 6fcfdd7e5dac08e480a3192669dd2c015a7a7c19 /libavcodec/mpeg12data.c | |
parent | 0674d1938ef33807ddcf20d8fa37690624d5453c (diff) | |
parent | fe27792fd779ac4cdd5e57be5f6f488483c307b2 (diff) | |
download | ffmpeg-9b4cc0f35c8123ce9ff505eebb5f3f261dff0bf8.tar.gz |
Merge commit 'fe27792fd779ac4cdd5e57be5f6f488483c307b2'
* commit 'fe27792fd779ac4cdd5e57be5f6f488483c307b2':
build: Move ff_mpeg12_frame_rate_tab to a separate file
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/mpeg12data.c')
-rw-r--r-- | libavcodec/mpeg12data.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/libavcodec/mpeg12data.c b/libavcodec/mpeg12data.c index 416bbb8129..4da96d7da3 100644 --- a/libavcodec/mpeg12data.c +++ b/libavcodec/mpeg12data.c @@ -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 AVRational ff_mpeg2_frame_rate_tab[] = { { 1, 1}, { 2, 1}, |