Michael Niedermayer
|
ba77fb61f7
|
Merge commit 'd80811c94e068085aab797f9ba35790529126f85'
* commit 'd80811c94e068085aab797f9ba35790529126f85':
riff: Use the correct logging context
Conflicts:
libavformat/asfdec_o.c
libavformat/avidec.c
libavformat/dxa.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/riff.h
libavformat/riffdec.c
libavformat/wavdec.c
libavformat/wtvdec.c
libavformat/xwma.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
|
2015-07-12 15:22:37 +02:00 |
|
Michael Niedermayer
|
1f69b7baa1
|
avformat/asfdec_f: Fix memleak
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-07-02 09:42:33 +02:00 |
|
John Adlum
|
72cad80016
|
avformat/asfdec_f: Add ASFDataType, use named types for metadata
This is based on asfdec_o.c, but uses a proper type instead of defines
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-07-02 04:58:27 +02:00 |
|
John Adlum
|
59fffefdb4
|
avformat/asfdec_f: Use dynamic allocation in asf_read_metadata() instead of a fixed size buffer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-07-02 04:58:23 +02:00 |
|
John Adlum
|
c8eca438a9
|
avformat/asfdec_f: factor error checking out of main header parsing loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-07-02 04:58:18 +02:00 |
|
John Adlum
|
811008b8ee
|
avformat/asfdec_f: Assert that packet positions match in asf_read_pts()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-07-01 18:47:59 +02:00 |
|
John Adlum
|
28206b75e8
|
avformat/asfdec_f: Correct skip to key code
Fixes Ticket3978
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-07-01 18:47:54 +02:00 |
|
Michael Niedermayer
|
8f9c39b3e8
|
avformat: rename asfdec.c to asfdec_f.c
leaving it as asfdec.c confuses git
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-06-30 12:23:12 +02:00 |
|