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
|
62a1e0035a
|
avformat/mlvdec: Use AVFormatContext->open_cb()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-05-11 22:53:12 +02:00 |
Carl Eugen Hoyos
|
ac923ed470
|
lavf/mlv: Only add streams that are supposed to contain frames.
Fixes ticket #4296.
Reviewed-by: Peter Ross
|
2015-02-07 16:23:36 +01:00 |
|
Michael Niedermayer
|
d1d8f866b5
|
avformat/mlvdec: Use avio_closep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-01-08 20:19:20 +01:00 |
|
Michael Niedermayer
|
edeaf6f3a4
|
avformat/mlvdec: Simplify code by using avio_closep()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-01-08 20:19:20 +01:00 |
Thomas Volkert
|
00d7555f34
|
wavdec: RIFX file format support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-12-18 00:10:35 +01:00 |
|
Michael Niedermayer
|
a9564e859b
|
avformat/mlvdec: Check the return code from strftime()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-10-26 17:07:29 +01:00 |
Reimar Döffinger
|
a0941c8a2b
|
Use new av_dict_set_int helper function.
Get rid of the many, slightly differing, implementations
of basically the same thing.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
|
2014-08-16 14:31:41 +02:00 |
James Almer
|
d34ec64a22
|
replace calls to url_feof() with avio_feof()
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-08-08 00:48:38 +02:00 |
Peter Ross
|
b3c0d010c3
|
avformat/mlvdec: close any additional .Mxx files
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-04-27 15:34:27 +02:00 |
|
Peter Ross
|
8bd6837e51
|
avformat/mlvdec: remove unused MlvContext.buffer
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-04-27 15:34:22 +02:00 |
|
Peter Ross
|
9abf08f79f
|
avformat/mlvdec: print unsigned chunk size
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-04-27 14:37:54 +02:00 |
|
Peter Ross
|
bdab0c2d76
|
avformat/mlvdec: process ff_get_wav_header return value
Fixes CID1206640.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-04-27 14:37:18 +02:00 |
|
Peter Ross
|
ab683efb2b
|
Magic Lantern Video (MLV) demuxer
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-04-19 05:06:00 +02:00 |