summaryrefslogtreecommitdiff
path: root/libavformat/rmdec.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709'Michael Niedermayer2014-10-211-1/+1
|\ | | | | | | | | | | | | | | | | | | * commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709': rmdec: stricter error check to avoid theoretical unitialized use Conflicts: libavformat/rmdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rmdec: stricter error check to avoid theoretical unitialized useVittorio Giovara2014-10-211-1/+1
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 90558
* | Merge commit '7207dd8f829baee58b4df6c97c19ffde77039e8d'Michael Niedermayer2014-10-211-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '7207dd8f829baee58b4df6c97c19ffde77039e8d': rmdec: check av_new_packet return value Conflicts: libavformat/rmdec.c See: c01a462cda8d7f298a3ac6d20752d23a11e43a8a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rmdec: check av_new_packet return valueVittorio Giovara2014-10-211-1/+3
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 733714
| * Replace av_malloc() and memset(0) by av_mallocz()Diego Biurrun2014-06-221-2/+1
| |
* | avformat/rmdec: very basic MLTI supportMichael Niedermayer2014-09-111-0/+15
| | | | | | | | | | | | Fixes Ticket2152 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | replace calls to url_feof() with avio_feof()James Almer2014-08-081-3/+3
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca'Michael Niedermayer2014-05-011-2/+0
|\ \ | |/ | | | | | | | | | | * commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca': rmdec: do not export anything to AVCodecContext.codec_name Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rmdec: do not export anything to AVCodecContext.codec_nameAnton Khirnov2014-05-011-2/+0
| | | | | | | | | | That field will be deprecated and the value that is written there is not particularly useful.
* | Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'Michael Niedermayer2014-03-111-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavf: more correct printf format specifiersDiego Biurrun2014-03-111-1/+3
| |
* | avformat/rmdec: when reading audio blocks, dont leave holes when reading failsMichael Niedermayer2014-01-091-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | avformat/rmdec: check that sub_packet_size fit in the packet for DEINT_ID_GENRMichael Niedermayer2014-01-071-0/+2
| | | | | | | | | | | | | | 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>
* | avformat/rmdec: move packet allocation downMichael Niedermayer2013-12-261-10/+10
| | | | | | | | | | | | | | 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>
* | avformat/rmdec: check against mismatching int4 interleaver parameters which ↵Michael Niedermayer2013-12-261-0/+4
| | | | | | | | | | | | | | | | | | 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>
* | avformat/rmdec: use ff_get_extradata()Michael Niedermayer2013-12-251-4/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rmdec: zero string destination before useMichael Niedermayer2013-12-211-0/+1
| | | | | | | | | | | | | | 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>
* | avformat/rmdec: english typosMichael Niedermayer2013-10-251-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rmdec: add some error messagesMichael Niedermayer2013-10-241-4/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rmdec: fix return code of ff_rm_parse_packet()Michael Niedermayer2013-10-241-1/+1
| | | | | | | | | | | | | | | | Broken by aecb9d3 Fixes assertion failure Fixes Ticket3042 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: use ff_alloc_extradata()Paul B Mahol2013-10-131-3/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '0f310a6f333b016d336674d086045e8473fdf918'Michael Niedermayer2013-09-191-3/+8
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '0f310a6f333b016d336674d086045e8473fdf918': rmdec: Validate the fps value Conflicts: libavformat/rmdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rmdec: Validate the fps valueMartin Storsjö2013-09-181-2/+7
| | | | | | | | | | | | | | | | 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>
* | Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'Michael Niedermayer2013-09-031-1/+1
|\ \ | |/ | | | | | | | | | | * commit '7df9e693a34c84c698da60426c78140c950f95ed': cosmetics: Fix ATRAC codec name spelling Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Fix ATRAC codec name spellingDiego Biurrun2013-09-021-1/+1
| |
* | Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'Michael Niedermayer2013-08-031-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Disable deprecation warnings for cases where a replacement is availableDiego Biurrun2013-08-021-0/+3
| |
| * rmdec: Use the AVIOContext given as parameter in rm_read_metadata()Michael Niedermayer2013-07-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * lavf: remove disabled FF_API_R_FRAME_RATE cruftAnton Khirnov2013-03-111-3/+0
| |
* | rmdec: Forward error messages from rm_assemble_video_frame() to the caller.Carl Eugen Hoyos2013-07-131-2/+6
| | | | | | | | | | Fixes the cause of a null pointer dereference on oom described in ticket #2724.
* | rmdec: fix crash in case of oomPiotr Bandurski2013-07-121-0/+2
| | | | | | | | | | | | Fixes ticket #2724 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rmdec: Pass AVIOContext to rm_read_metadata()Michael Niedermayer2013-07-021-6/+7
| | | | | | | | | | | | | | Fix null pointer dereference Fixes Ticket2588 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rmdec: dont return uninitialized dataMichael Niedermayer2013-04-171-1/+6
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rmdec: flush audio packet on seekingMichael Niedermayer2013-03-181-0/+13
| | | | | | | | | | | | Fixes Ticket1605 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer2013-03-081-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1afddbe59e96af75f1c07605afc95615569f388f': avpacket: use AVBuffer to allow refcounting the packets. Conflicts: libavcodec/avpacket.c libavcodec/utils.c libavdevice/v4l2.c libavformat/avidec.c libavformat/flacdec.c libavformat/id3v2.c libavformat/matroskaenc.c libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avpacket: use AVBuffer to allow refcounting the packets.Anton Khirnov2013-03-081-0/+4
| | | | | | | | | | | | This will allow us to avoid copying the packets in many cases. This breaks ABI.
* | rmdec: Limit videobufsize to remaining amount of dataMichael Niedermayer2013-01-071-0/+5
| | | | | | | | | | | | | | Fixes excessive memory allocation Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rmdec: fix compiler warning for uninitialized variablesJean First2012-12-251-2/+3
| | | | | | | | | | Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rmdec: set bit rate for ra3Piotr Bandurski2012-12-231-1/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rmdec: set bit rate for ra4Piotr Bandurski2012-12-231-1/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Cosmetics: Reindent after last commit.Carl Eugen Hoyos2012-12-181-8/+8
| |
* | Do not skip three bytes and don't search for extradata in old realaudio files.Carl Eugen Hoyos2012-12-181-0/+4
| | | | | | | | Fixes ticket #1557.
* | Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'Michael Niedermayer2012-11-291-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bfe5454cd238b16e7977085f880205229103eccb': lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h lavf: move "MP3 " fourcc from riff to nut fate: vpx: Add dependencies fate: Fix wavpack-matroskamode test dependencies x86: dsputilenc: port to cpuflags Conflicts: libavformat/internal.h libavformat/nut.c tests/fate/vpx.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.hJustin Ruggles2012-11-281-1/+0
| |
* | rmdec: fix av_log level and contextMichael Niedermayer2012-11-231-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-131-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (24 commits) yop: set channel layout wtv: set channel layout for mpeg audio westwood_aud: set channel layout wc3movie: set channel layout tmv: set channel layout tiertexseq: set channel layout swfdec: set channel layout sol: set channel layout smacker: set channel layout siff: set channel layout sierravmd: set channel layout rtpdec_amr: set channel layout rsodec: set channel layout rmdec: set channel layout for RA version 3 qcp: set channel layout psxstr: set channel layout omadec: set channel layout oggparsespeex: validate channel count and set channel layout nuv: set channel layout mxg: set channel layout ... Conflicts: libavformat/swfdec.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rmdec: set channel layout for RA version 3Justin Ruggles2012-11-121-0/+2
| |
* | rmdec: fix null derefercneMichael Niedermayer2012-10-261-2/+5
| | | | | | | | | | Fixes CID733714 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rmdec: use av_assert for audio_pkt_cntMichael Niedermayer2012-10-261-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7'Michael Niedermayer2012-10-161-41/+1
|\ \ | |/ | | | | | | | | | | | | | | * commit '4c995fafd861f537360b3717901cdbed6a6844e7': configure: simplify get_version() function build: support asan and tsan toolchain shortcuts rmdec: Move SIPR code shared with Matroska demuxer to a separate file Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status