diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 05:14:53 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 05:15:19 +0400 |
commit | 61b3b3315c465ca7d74d3e95a881470642afddbc (patch) | |
tree | 5abaf8307c5de58a870877d8bdb11aa1cb0f6594 /libavformat/mov.c | |
parent | 45ba9d8545829e9c3df1b57de0b00256d8eddaac (diff) | |
parent | f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509 (diff) |
Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509'
* commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509':
lavf: add supported extension to avi and mov demuxers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
-rw-r--r-- | libavformat/mov.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index e025133266..c711be1609 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3709,6 +3709,7 @@ AVInputFormat ff_mov_demuxer = { .name = "mov,mp4,m4a,3gp,3g2,mj2", .long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"), .priv_data_size = sizeof(MOVContext), + .extensions = "mov,mp4,m4a,3gp,3g2,mj2", .read_probe = mov_probe, .read_header = mov_read_header, .read_packet = mov_read_packet, |