| OLD | NEW |
| 1 /* | 1 /* |
| 2 * RIFF codec tags | 2 * RIFF codec tags |
| 3 * Copyright (c) 2000 Fabrice Bellard | 3 * Copyright (c) 2000 Fabrice Bellard |
| 4 * | 4 * |
| 5 * This file is part of FFmpeg. | 5 * This file is part of FFmpeg. |
| 6 * | 6 * |
| 7 * FFmpeg is free software; you can redistribute it and/or | 7 * FFmpeg is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Lesser General Public | 8 * modify it under the terms of the GNU Lesser General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2.1 of the License, or (at your option) any later version. | 10 * version 2.1 of the License, or (at your option) any later version. |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 { CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') }, | 52 { CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') }, |
| 53 { CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 0 ) }, /* some broken avi use
this */ | 53 { CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 0 ) }, /* some broken avi use
this */ |
| 54 { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', '1') }, | 54 { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', '1') }, |
| 55 { CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') }, | 55 { CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') }, |
| 56 { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, | 56 { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, |
| 57 { CODEC_ID_MPEG4, MKTAG('U', 'M', 'P', '4') }, | 57 { CODEC_ID_MPEG4, MKTAG('U', 'M', 'P', '4') }, |
| 58 { CODEC_ID_MPEG4, MKTAG('W', 'V', '1', 'F') }, | 58 { CODEC_ID_MPEG4, MKTAG('W', 'V', '1', 'F') }, |
| 59 { CODEC_ID_MPEG4, MKTAG('S', 'E', 'D', 'G') }, | 59 { CODEC_ID_MPEG4, MKTAG('S', 'E', 'D', 'G') }, |
| 60 { CODEC_ID_MPEG4, MKTAG('R', 'M', 'P', '4') }, | 60 { CODEC_ID_MPEG4, MKTAG('R', 'M', 'P', '4') }, |
| 61 { CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, | 61 { CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, |
| 62 { CODEC_ID_MPEG4, MKTAG('W', 'A', 'W', 'V') }, /* WaWv MPEG-4 Video C
odec */ |
| 62 { CODEC_ID_MPEG4, MKTAG('F', 'F', 'D', 'S') }, | 63 { CODEC_ID_MPEG4, MKTAG('F', 'F', 'D', 'S') }, |
| 63 { CODEC_ID_MPEG4, MKTAG('F', 'V', 'F', 'W') }, | 64 { CODEC_ID_MPEG4, MKTAG('F', 'V', 'F', 'W') }, |
| 64 { CODEC_ID_MPEG4, MKTAG('D', 'C', 'O', 'D') }, | 65 { CODEC_ID_MPEG4, MKTAG('D', 'C', 'O', 'D') }, |
| 65 { CODEC_ID_MPEG4, MKTAG('M', 'V', 'X', 'M') }, | 66 { CODEC_ID_MPEG4, MKTAG('M', 'V', 'X', 'M') }, |
| 66 { CODEC_ID_MPEG4, MKTAG('P', 'M', '4', 'V') }, | 67 { CODEC_ID_MPEG4, MKTAG('P', 'M', '4', 'V') }, |
| 67 { CODEC_ID_MPEG4, MKTAG('S', 'M', 'P', '4') }, | 68 { CODEC_ID_MPEG4, MKTAG('S', 'M', 'P', '4') }, |
| 68 { CODEC_ID_MPEG4, MKTAG('D', 'X', 'G', 'M') }, | 69 { CODEC_ID_MPEG4, MKTAG('D', 'X', 'G', 'M') }, |
| 69 { CODEC_ID_MPEG4, MKTAG('V', 'I', 'D', 'M') }, | 70 { CODEC_ID_MPEG4, MKTAG('V', 'I', 'D', 'M') }, |
| 70 { CODEC_ID_MPEG4, MKTAG('M', '4', 'T', '3') }, | 71 { CODEC_ID_MPEG4, MKTAG('M', '4', 'T', '3') }, |
| 71 { CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'X') }, | 72 { CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'X') }, |
| (...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 544 *au_scale= stream->time_base.num; | 545 *au_scale= stream->time_base.num; |
| 545 *au_rate = stream->time_base.den; | 546 *au_rate = stream->time_base.den; |
| 546 }else{ | 547 }else{ |
| 547 *au_scale= stream->block_align ? stream->block_align*8 : 8; | 548 *au_scale= stream->block_align ? stream->block_align*8 : 8; |
| 548 *au_rate = stream->bit_rate ? stream->bit_rate : 8*stream->sample_rate; | 549 *au_rate = stream->bit_rate ? stream->bit_rate : 8*stream->sample_rate; |
| 549 } | 550 } |
| 550 gcd= av_gcd(*au_scale, *au_rate); | 551 gcd= av_gcd(*au_scale, *au_rate); |
| 551 *au_scale /= gcd; | 552 *au_scale /= gcd; |
| 552 *au_rate /= gcd; | 553 *au_rate /= gcd; |
| 553 } | 554 } |
| OLD | NEW |