diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-05-08 23:50:26 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-05-08 23:50:26 +0300 |
| commit | 1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07 (patch) | |
| tree | c5e99bfe0e69cd37fb8ac70fadf00ce54a1cbe3c /libmpdemux | |
| parent | f2864e9a072f53c38a04dd7c44392521777dc908 (diff) | |
| parent | 86c9fb2e8930de031807513c9b93d47394d2d2fa (diff) | |
| download | mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.bz2 mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.xz | |
Merge svn changes up to r29277
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/extension.c | 6 | ||||
| -rw-r--r-- | libmpdemux/muxer_mpeg.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c index 88cc17f3a7..3c0ad66cf7 100644 --- a/libmpdemux/extension.c +++ b/libmpdemux/extension.c @@ -21,9 +21,9 @@ static struct { { "vob", DEMUXER_TYPE_MPEG_PS }, { "m2v", DEMUXER_TYPE_MPEG_PS }, { "avi", DEMUXER_TYPE_AVI }, - { "mp4", DEMUXER_TYPE_MOV }, - { "mov", DEMUXER_TYPE_MOV }, - { "qt", DEMUXER_TYPE_MOV }, + { "mp4", DEMUXER_TYPE_LAVF }, + { "mov", DEMUXER_TYPE_LAVF }, + { "qt", DEMUXER_TYPE_LAVF }, { "asx", DEMUXER_TYPE_ASF }, { "asf", DEMUXER_TYPE_ASF }, { "wmv", DEMUXER_TYPE_ASF }, diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index a4504caa99..c93c818e21 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -214,6 +214,8 @@ m_option_t mpegopts_conf[] = { {NULL, NULL, 0, 0, 0, 0, NULL} }; +int mp_a52_framesize(uint8_t *buf, int *srate); + static void fix_audio_sys_header(muxer_priv_t *priv, uint8_t id, uint8_t newid, uint32_t size) { uint8_t i; |