aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rmdec.c
Commit message (Collapse)AuthorAgeFilesLines
* avformat/rmdec: MLTI with multiple MDPR supportMichael Niedermayer2015-08-141-8/+38
| | | | | | Fixes Ticket4496 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/rmdec: Move MLTI handling out of ff_rm_read_mdpr_codecdata()Michael Niedermayer2015-08-141-15/+22
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer2015-07-271-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: Consistently prefix input buffer definesVittorio Giovara2015-07-271-3/+3
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-201-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Replace av_dlog with normal av_log at trace levelVittorio Giovara2015-04-191-3/+3
| | | | | | | | This applies to every library where performance is not critical.
| * rmdec: Improve message for demux errorCarl Eugen Hoyos2015-03-081-1/+1
| | | | | | | | | | | | | | 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>
* | avformat/rmdec: fix support for 0 sized mdprMichael Niedermayer2015-03-261-0/+2
| | | | | | | | | | | | Fixes Ticket4393 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix spelling errorsAndreas Cadhalpun2015-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit 'da7e31a240f276836a0b90ca6c0714181b353cc4'Michael Niedermayer2015-02-171-0/+6
|\| | | | | | | | | | | | | * commit 'da7e31a240f276836a0b90ca6c0714181b353cc4': rmdec: Check memory allocations from ff_rm_alloc_rmstream() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rmdec: Check memory allocations from ff_rm_alloc_rmstream()Hugo Beauzée-Luyssen2015-02-171-0/+6
| | | | | | | | Bug-Id: CID 1257835
* | Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'Michael Niedermayer2015-02-141-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avformat: Don't anonymously typedef structsDiego Biurrun2015-02-141-1/+1
| |
* | avformat/rmdec: Check the return value of av_get_packet()Michael Niedermayer2015-01-181-6/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rm: fix memory leak on init failurewm42015-01-101-5/+14
| | | | | | | | | | | | | | 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>
* | avformat/rmdec: Check for overflow in ff_rm_read_mdpr_codecdata()Michael Niedermayer2014-12-061-1/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rmdec: rm_read_extradata: add error message for oversized extradataMichael Niedermayer2014-12-061-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4'Michael Niedermayer2014-12-061-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4': rm: Use the correct codec_data_size signedness Conflicts: libavformat/rm.h libavformat/rmdec.c See: a6f730730b82645a9d31aad0968487cb77d6946c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rm: Use the correct codec_data_size signednessLuca Barbato2014-12-041-3/+3
| | | | | | | | | | | | | | | | | | 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>
* | avformat/rmdec: Check codec_data_sizeMichael Niedermayer2014-12-031-0/+3
| | | | | | | | | | | | | | Fixes infinite loop Fixes Ticket4154 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Rename sync() functions in libavformat.Carl Eugen Hoyos2014-11-251-3/+3
| | | | | | | | | | Fixes compilation on Android where the sync() definition in unistd.h interferes with the static definitions in libavformat.
* | 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
| |