Michael Niedermayer
d2e5297e93
Merge commit '796268654c7807c9a1cfb322c838383e2b900d60'
...
* commit '796268654c7807c9a1cfb322c838383e2b900d60':
asfdec: always reset packet state after seeking
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-12 16:34:18 +02:00
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
72527d9c54
Merge commit '872fab4a3df48e7e6484333ee2228c684e319634'
...
* commit '872fab4a3df48e7e6484333ee2228c684e319634':
asfdec: Fix reading from the pipe
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-10 20:47:46 +02:00
Michael Niedermayer
30ffbeb04a
Merge commit '016cac75c6061a1c03f812ddf258b8baefe70b00'
...
* commit '016cac75c6061a1c03f812ddf258b8baefe70b00':
asfdec: prevent the infinite loop in detect unknown_subobject
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-03 03:58:33 +02:00
Michael Niedermayer
7755a57440
Merge commit '9752d2e6cc9b9e8070ec515db8ed8374683d0856'
...
* commit '9752d2e6cc9b9e8070ec515db8ed8374683d0856':
asfdec: prevent possible memory leak in the asf_read_metadata_obj
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-03 03:51:00 +02:00
Michael Niedermayer
3cd6b6aa0f
Merge commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68'
...
* commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68':
asf: Do not skip data streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-30 12:48:11 +02:00
Michael Niedermayer
0d5a27c2b5
Rename asfdec-o.c to asfdec_o.c
...
Most files use _ instead of - as spacer, so this is more consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-30 12:23:44 +02:00
