40d552dae6
Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'
...
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
Replace av_dlog with normal av_log at trace level
Conflicts:
ffplay.c
libavdevice/fbdev_dec.c
libavfilter/avfilter.c
libavfilter/internal.h
libavfilter/setpts.c
libavfilter/src_movie.c
libavfilter/vf_crop.c
libavfilter/vf_drawtext.c
libavfilter/vf_fieldorder.c
libavformat/assdec.c
libavformat/avidec.c
libavformat/flvdec.c
libavformat/http.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/mov.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/mux.c
libavformat/mxfdec.c
libavformat/nsvdec.c
libavformat/oggdec.c
libavformat/r3d.c
libavformat/rtspdec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 03:19:47 +02:00
1a3eb042c7
Replace av_dlog with normal av_log at trace level
...
This applies to every library where performance is not critical.
2015-04-19 12:41:59 +01:00
df43d03731
avformat/rmdec: fix support for 0 sized mdpr
...
Fixes Ticket4393
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-26 02:02:18 +01:00
0f9f7969ef
rmdec: Improve message for demux error
...
Use correct context, reduce log level, don't assume it is a video stream,
and print the tag of the unknown stream.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-03-08 02:35:04 +00:00
482c86f231
fix spelling errors
...
opttimizations -> optimizations
grabing -> grabbing
many resource -> many resources
isnt -> isn't
silcense -> silence
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-06 21:35:00 +01:00
575ed4fe37
Merge commit 'da7e31a240f276836a0b90ca6c0714181b353cc4'
...
* commit 'da7e31a240f276836a0b90ca6c0714181b353cc4':
rmdec: Check memory allocations from ff_rm_alloc_rmstream()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 21:42:36 +01:00
da7e31a240
rmdec: Check memory allocations from ff_rm_alloc_rmstream()
...
Bug-Id: CID 1257835
2015-02-17 12:16:43 -05:00
a0fe1a25fa
Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'
...
* commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e':
avformat: Don't anonymously typedef structs
Conflicts:
libavformat/adtsenc.c
libavformat/aiffenc.c
libavformat/avidec.c
libavformat/gif.c
libavformat/iff.c
libavformat/img2dec.c
libavformat/jvdec.c
libavformat/matroskadec.c
libavformat/udp.c
libavformat/wtvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 21:07:40 +01:00
daf8cf358a
avformat: Don't anonymously typedef structs
2015-02-14 10:13:47 -08:00
65b83ce01b
avformat/rmdec: Check the return value of av_get_packet()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-18 20:55:49 +01:00
aab74a38b8
rm: fix memory leak on init failure
...
AVInputFormat.read_close is not called if AVInputFormat.read_header
fails, so this needs to be handled separately.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-10 00:26:43 +01:00
03abf55f25
avformat/rmdec: Check for overflow in ff_rm_read_mdpr_codecdata()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-06 00:49:23 +01:00
50f9de59a0
avformat/rmdec: rm_read_extradata: add error message for oversized extradata
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-06 00:49:20 +01:00
ef2f9073dd
Merge commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4'
...
* commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4':
rm: Use the correct codec_data_size signedness
Conflicts:
libavformat/rm.h
libavformat/rmdec.c
See: a6f730730b
2014-12-06 00:48:47 +01:00
1c77ead1fb
rm: Use the correct codec_data_size signedness
...
The function takes a size and not an offset.
CC: libav-stable@libav.org
Sample-Id: rm_deadlock.rm
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-12-04 13:14:28 +00:00
a6f730730b
avformat/rmdec: Check codec_data_size
...
Fixes infinite loop
Fixes Ticket4154
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-03 20:01:18 +01:00
5badcdf20d
Rename sync() functions in libavformat.
...
Fixes compilation on Android where the sync() definition in
unistd.h interferes with the static definitions in libavformat.
2014-11-25 23:49:58 +01:00
979062fe2f
Merge commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709'
...
* commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709':
rmdec: stricter error check to avoid theoretical unitialized use
Conflicts:
libavformat/rmdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21 23:47:44 +02:00
840bc8e284
Merge commit '7207dd8f829baee58b4df6c97c19ffde77039e8d'
...
* commit '7207dd8f829baee58b4df6c97c19ffde77039e8d':
rmdec: check av_new_packet return value
Conflicts:
libavformat/rmdec.c
See: c01a462cda
2014-10-21 23:01:26 +02:00
be42c0b8d5
rmdec: stricter error check to avoid theoretical unitialized use
...
CC: libav-stable@libav.org
Bug-Id: CID 90558
2014-10-21 14:37:48 +01:00
7207dd8f82
rmdec: check av_new_packet return value
...
CC: libav-stable@libav.org
Bug-Id: CID 733714
2014-10-21 14:37:48 +01:00
ea7ebadeb7
avformat/rmdec: very basic MLTI support
...
Fixes Ticket2152
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 14:13:03 +02:00
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
73953df71a
Replace av_malloc() and memset(0) by av_mallocz()
2014-06-22 18:43:11 +02:00
b917d7024e
Merge commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca'
...
* commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca':
rmdec: do not export anything to AVCodecContext.codec_name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 17:49:57 +02:00
ef9732162c
rmdec: do not export anything to AVCodecContext.codec_name
...
That field will be deprecated and the value that is written there is not
particularly useful.
2014-05-01 09:26:51 +02:00
28ee7757f5
Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'
...
* commit 'd92024f18fa3d69937cb2575f3a8bf973df02430':
lavf: more correct printf format specifiers
Conflicts:
libavformat/asfdec.c
libavformat/cafdec.c
libavformat/dxa.c
libavformat/framecrcenc.c
libavformat/hnm.c
libavformat/iff.c
libavformat/mov.c
libavformat/mxfdec.c
libavformat/rmdec.c
libavformat/rpl.c
libavformat/smacker.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11 21:05:34 +01:00
d92024f18f
lavf: more correct printf format specifiers
2014-03-11 13:13:41 +01:00
77d2a1ca59
avformat/rmdec: when reading audio blocks, dont leave holes when reading fails
...
The fate test is changed because the reference file depends on the use of
non cleared data at the very
end. Alternatively we could upload a new reference file, though that would
then have to be changed every time the handling of a truncated frame changes
or theres a change to error concealment, each time adding a new file ...
Fixes use of uninitialized memory
Fixed: msan_uninit-mem_7f3c02b81363_2787_RLG2_19.rm
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-09 23:50:59 +01:00
ed1eb9602c
avformat/rmdec: check that sub_packet_size fit in the packet for DEINT_ID_GENR
...
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fa8c49400d0_3923_audiosig.rm
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-07 00:26:33 +01:00
165f96cd2d
avformat/rmdec: move packet allocation down
...
Fixes memleak
Fixes: msan_uninit-mem_7fc5d73327d4_6192_kuerti.ra
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-26 04:16:10 +01:00
4e394a98f2
avformat/rmdec: check against mismatching int4 interleaver parameters which would leave uninitialized holes
...
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9cf38857c0_4582_coop.ra
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-26 04:02:40 +01:00
fd335aa326
avformat/rmdec: use ff_get_extradata()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-25 17:38:29 +01:00
b797a00f63
avformat/rmdec: zero string destination before use
...
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9677850d99_4635_crashed.rm
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-21 23:27:09 +01:00
d04ec6ffc5
avformat/rmdec: english typos
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 19:14:36 +02:00
aaf02f6ede
avformat/rmdec: add some error messages
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-24 17:05:57 +02:00
f7106e00f7
avformat/rmdec: fix return code of ff_rm_parse_packet()
...
Broken by aecb9d3
2013-10-24 16:53:50 +02:00
a807c68253
avformat: use ff_alloc_extradata()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-13 20:13:38 +00:00
f54d751f33
Merge commit '0f310a6f333b016d336674d086045e8473fdf918'
...
* commit '0f310a6f333b016d336674d086045e8473fdf918':
rmdec: Validate the fps value
Conflicts:
libavformat/rmdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-19 10:38:40 +02:00
0f310a6f33
rmdec: Validate the fps value
...
Abort if it is invalid if strict error checking has been requested.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-18 11:30:06 +03:00
4cfe3b7405
Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'
...
* commit '7df9e693a34c84c698da60426c78140c950f95ed':
cosmetics: Fix ATRAC codec name spelling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-03 15:05:18 +02:00
7df9e693a3
cosmetics: Fix ATRAC codec name spelling
2013-09-02 21:38:57 +02:00
20be5e0a0e
Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'
...
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
Disable deprecation warnings for cases where a replacement is available
Conflicts:
libavcodec/avpacket.c
libavcodec/pthread.c
libavcodec/utils.c
libavdevice/v4l2.c
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 10:08:30 +02:00
7950e519bb
Disable deprecation warnings for cases where a replacement is available
2013-08-02 19:19:02 +02:00
aecb9d39bc
rmdec: Forward error messages from rm_assemble_video_frame() to the caller.
...
Fixes the cause of a null pointer dereference on oom
described in ticket #2724 .
2013-07-13 17:16:30 +02:00
161047f010
rmdec: fix crash in case of oom
...
Fixes ticket #2724
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 04:24:35 +02:00
d35b6cd377
rmdec: Use the AVIOContext given as parameter in rm_read_metadata()
...
This fixes crashes when playing back certain RealRTSP streams.
When invoked from the RTP depacketizer, the full realmedia
demuxer isn't invoked, but only certain functions from it, where
a separate AVIOContext is passed in as parameter (for the buffer
containing the data to parse). The functions called from within
those entry points should only be using that parameter, not
s->pb. In the depacketizer case, s is the RTSP context, where ->pb
is null.
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-07 13:30:12 +03:00
bf87908cd8
rmdec: Pass AVIOContext to rm_read_metadata()
...
Fix null pointer dereference
Fixes Ticket2588
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-02 00:45:15 +02:00
161dee4321
rmdec: dont return uninitialized data
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 02:16:58 +02:00
519ebb5ee5
rmdec: flush audio packet on seeking
...
Fixes Ticket1605
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 00:08:59 +01:00
Michael Niedermayer
Vittorio Giovara
Carl Eugen Hoyos
Andreas Cadhalpun
Hugo Beauzée-Luyssen
Diego Biurrun
wm4
Luca Barbato
James Almer
Anton Khirnov
Paul B Mahol
Martin Storsjö
Piotr Bandurski