Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavformat/rmdec.c
AgeCommit message (Collapse)Author
2014-05-01Merge commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca'Michael Niedermayer
* commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca': rmdec: do not export anything to AVCodecContext.codec_name Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01rmdec: do not export anything to AVCodecContext.codec_nameAnton Khirnov
That field will be deprecated and the value that is written there is not particularly useful.
2014-03-12Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'Michael Niedermayer
* 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-11lavf: more correct printf format specifiersDiego Biurrun
2014-01-10avformat/rmdec: when reading audio blocks, dont leave holes when reading failsMichael Niedermayer
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-07avformat/rmdec: check that sub_packet_size fit in the packet for DEINT_ID_GENRMichael Niedermayer
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>
2013-12-26avformat/rmdec: move packet allocation downMichael Niedermayer
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-26avformat/rmdec: check against mismatching int4 interleaver parameters which ↵Michael Niedermayer
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-25avformat/rmdec: use ff_get_extradata()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-22avformat/rmdec: zero string destination before useMichael Niedermayer
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-10-25avformat/rmdec: english typosMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-24avformat/rmdec: add some error messagesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-24avformat/rmdec: fix return code of ff_rm_parse_packet()Michael Niedermayer
Broken by aecb9d3 Fixes assertion failure Fixes Ticket3042 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-14avformat: use ff_alloc_extradata()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-19Merge commit '0f310a6f333b016d336674d086045e8473fdf918'Michael Niedermayer
* commit '0f310a6f333b016d336674d086045e8473fdf918': rmdec: Validate the fps value Conflicts: libavformat/rmdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-18rmdec: Validate the fps valueMartin Storsjö
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-03Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'Michael Niedermayer
* commit '7df9e693a34c84c698da60426c78140c950f95ed': cosmetics: Fix ATRAC codec name spelling Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-02cosmetics: Fix ATRAC codec name spellingDiego Biurrun
2013-08-03Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'Michael Niedermayer
* 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-02Disable deprecation warnings for cases where a replacement is availableDiego Biurrun
2013-07-13rmdec: Forward error messages from rm_assemble_video_frame() to the caller.Carl Eugen Hoyos
Fixes the cause of a null pointer dereference on oom described in ticket #2724.
2013-07-12rmdec: fix crash in case of oomPiotr Bandurski
Fixes ticket #2724 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-07rmdec: Use the AVIOContext given as parameter in rm_read_metadata()Michael Niedermayer
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-02rmdec: Pass AVIOContext to rm_read_metadata()Michael Niedermayer
Fix null pointer dereference Fixes Ticket2588 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17rmdec: dont return uninitialized dataMichael Niedermayer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18rmdec: flush audio packet on seekingMichael Niedermayer
Fixes Ticket1605 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-11lavf: remove disabled FF_API_R_FRAME_RATE cruftAnton Khirnov
2013-03-08Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer
* 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>
2013-03-08avpacket: use AVBuffer to allow refcounting the packets.Anton Khirnov
This will allow us to avoid copying the packets in many cases. This breaks ABI.
2013-01-08rmdec: Limit videobufsize to remaining amount of dataMichael Niedermayer
Fixes excessive memory allocation Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-26rmdec: fix compiler warning for uninitialized variablesJean First
Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-23rmdec: set bit rate for ra3Piotr Bandurski
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-23rmdec: set bit rate for ra4Piotr Bandurski
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19Cosmetics: Reindent after last commit.Carl Eugen Hoyos
2012-12-19Do not skip three bytes and don't search for extradata in old realaudio files.Carl Eugen Hoyos
Fixes ticket #1557.
2012-11-29Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'Michael Niedermayer
* 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>
2012-11-28lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.hJustin Ruggles
2012-11-23rmdec: fix av_log level and contextMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-11-12rmdec: set channel layout for RA version 3Justin Ruggles
2012-10-26rmdec: fix null derefercneMichael Niedermayer
Fixes CID733714 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26rmdec: use av_assert for audio_pkt_cntMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7'Michael Niedermayer
* 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>
2012-10-15rmdec: Move SIPR code shared with Matroska demuxer to a separate fileDiego Biurrun
2012-10-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avcodec: Convert some commented-out printf/av_log instances to av_dlog avcodec: Drop silly and/or broken printf debug output avcodec: Drop some silly commented-out av_log() invocations avformat: Convert some commented-out printf/av_log instances to av_dlog avformat: Remove non-compiling and/or silly commented-out printf/av_log statements Remove some silly disabled code. ac3dec: ensure get_buffer() gets a buffer for the correct number of channels Conflicts: libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h264.c libavcodec/h264_parser.c libavcodec/mjpegdec.c libavcodec/motion_est_template.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo_enc.c libavcodec/put_bits.h libavcodec/ratecontrol.c libavcodec/wmaenc.c libavdevice/timefilter.c libavformat/asfdec.c libavformat/avidec.c libavformat/avienc.c libavformat/flvenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-01avformat: Convert some commented-out printf/av_log instances to av_dlogDiego Biurrun
2012-09-04rmdec: remove unused variableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-21rmdec: parse logical-fileinfo, instead of creating phantom tracksMichael Niedermayer
Fixes Ticket1090 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-21rmdec: pass mime type to ff_rm_read_mdpr_codecdata()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-08Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-04 07:12:09 +0300