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
AgeCommit message (Collapse)Author
2015-10-27Replace remaining occurances of av_free_packet with av_packet_unrefHendrik Leppkes
2015-10-27Merge commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457'Hendrik Leppkes
* commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457': avpacket: Replace av_free_packet with av_packet_unref Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-26avpacket: Replace av_free_packet with av_packet_unrefLuca Barbato
`av_packet_unref` matches the AVFrame ref-counted API and can be used as a drop in replacement. Deprecate `av_free_packet`.
2015-10-22libavformat/electronicarts: also demux mpeg audio layer 2Peter Ross
Signed-off-by: Peter Ross <pross@xvid.org> http://wiki.multimedia.cx/index.php?title=Electronic_Arts_SCxl Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-22avformat/electronicarts: fix demuxing of certain eam filesPaul B Mahol
Such files have gaps between header chunks. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-10-22avformat/electronicarts: support ADPCM PSXPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-06-25electronicarts: demux alpha streamPeter Ross
Electronic Arts VP6 files may contain two video streams: one for the primary video stream and another for the alpha mask. The file format uses identical data structures for both streams. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-25electronicarts: move video stream properties into dedicated structurePeter Ross
This is required for the alpha stream demux patch. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-23avformat/electronicarts: Fixed ea_probe function to accept vp6a videosStephan Vedder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24Correct few "ffmpeg" typosPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-08-22Merge commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421'Michael Niedermayer
* commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421': electronicarts: set the framerate for TGQ/TQI Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22Merge commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136'Michael Niedermayer
* commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136': electronicarts: read the framerate for MAD Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22Merge commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b'Michael Niedermayer
* commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b': electronicarts: do not fail on zero-sized chunks Conflicts: libavformat/electronicarts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22electronicarts: set the framerate for TGQ/TQIAnton Khirnov
It is hardcoded to 15fps.
2014-08-22electronicarts: read the framerate for MADAnton Khirnov
2014-08-22electronicarts: do not fail on zero-sized chunksAnton Khirnov
At least one FATE sample contains such chunks and happens to work simply by accident (due to find_stream_info() swallowing the error). CC: libav-stable@libav.org
2014-08-08replace calls to url_feof() with avio_feof()James Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
2013-12-21avformat/electronicarts: detect endianness by comparing sizes instead of ↵Michael Niedermayer
using an arbitrary threshold Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-21avformat/electronicarts: use 64bit variable for avio_tell() resultMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-12avformat/electronicarts: check chunksize more completely in probe()Michael Niedermayer
Fixes probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-11avformat/electronicarts: check chunk size.Michael Niedermayer
Fix infinite loop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-30Merge commit 'a9221e39600a31ee13e736e9e47743cde23f0280'Michael Niedermayer
* commit 'a9221e39600a31ee13e736e9e47743cde23f0280': electronicarts: Add more sanity checking for the number of channels Note: This check is probably unnecessary Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-29electronicarts: Add more sanity checking for the number of channelsMartin Storsjö
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-23Merge commit 'f7e616959aff8706edccdae763c24c897c449f6f'Michael Niedermayer
* commit 'f7e616959aff8706edccdae763c24c897c449f6f': electronicarts: Check packet sizes before reading Conflicts: libavformat/electronicarts.c See: fb1ea777b3a01be6d71a103529ad37982707cacc Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22electronicarts: Check packet sizes before readingMartin Storsjö
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-16Merge commit '163a729725c6eb0081b0af41a7279f7d19aee86e'Michael Niedermayer
* commit '163a729725c6eb0081b0af41a7279f7d19aee86e': electronicarts: Let functions always returning the same value return void Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16Merge commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529'Michael Niedermayer
* commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529': electronicarts: Improve some function/variable names Conflicts: libavformat/electronicarts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16Merge commit 'a90cff137b2aca89380b0acad41cd7bb05619ece'Michael Niedermayer
* commit 'a90cff137b2aca89380b0acad41cd7bb05619ece': electronicarts: comment wording fixes Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16Merge commit '288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c'Michael Niedermayer
* commit '288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c': electronicarts: Remove bogus function documentation Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16Merge commit '8747fce91fca6bb8e9936497f2de05c905cf43b5'Michael Niedermayer
* commit '8747fce91fca6bb8e9936497f2de05c905cf43b5': electronicarts: K&R formatting cosmetics Conflicts: libavformat/electronicarts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-15electronicarts: Let functions always returning the same value return voidDiego Biurrun
2013-08-15electronicarts: Improve some function/variable namesDiego Biurrun
2013-08-15electronicarts: comment wording fixesDiego Biurrun
2013-08-15electronicarts: Remove bogus function documentationDiego Biurrun
2013-08-15electronicarts: K&R formatting cosmeticsDiego Biurrun
2013-03-28electronicarts: check timebase, fix assertion failureMichael Niedermayer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-15lavc & lavf: replace deprecated av_log* functionsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-11lavf: remove disabled FF_API_R_FRAME_RATE cruftAnton Khirnov
2012-11-17electronicarts: check size before reading duration out of a chunk.Michael Niedermayer
Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-11electronic arts: support rare samples containing adpcm_ea_r1 audioPeter Ross
Fixes ticket #1549. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-11electronicarts: use av_log_ask_for_samplePeter Ross
Reviewed-by: Paul B Mahol <onemda@gmail.com> 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>
2012-08-07Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov
2012-08-06Replace various inlined inverse AVRational with av_inv_q().Clément Bœsch
2012-07-31Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avformat: Drop pointless "format" from container long names swscale: bury one more piece of inline asm under HAVE_INLINE_ASM. wv: K&R formatting cosmetics configure: Add missing descriptions to help output h264_ps: declare array of colorspace strings on its own line. fate: amix: specify f32 sample format for comparison tiny_psnr: support 32-bit float samples eamad/eatgq/eatqi: call special EA IDCT directly eamad: remove use of MpegEncContext mpegvideo: remove unnecessary inclusions of faandct.h af_asyncts: avoid overflow in out_size with large delta values af_asyncts: add first_pts option Conflicts: configure libavcodec/eamad.c libavcodec/h264_ps.c libavformat/crcenc.c libavformat/ffmdec.c libavformat/ffmenc.c libavformat/framecrcenc.c libavformat/md5enc.c libavformat/nutdec.c libavformat/rawenc.c libavformat/yuv4mpeg.c tests/tiny_psnr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-30avformat: Drop pointless "format" from container long namesDiego Biurrun
2012-07-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: flvdec: remove spurious use of stream id lavf: deprecate r_frame_rate. lavf: round estimated average fps to a "standard" fps. Conflicts: ffmpeg.c ffprobe.c libavformat/avformat.h libavformat/electronicarts.c libavformat/flvdec.c libavformat/rawdec.c libavformat/utils.c tests/ref/fate/iv8-demux Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-29lavf: deprecate r_frame_rate.Anton Khirnov
According to its description, it is supposed to be the LCM of all the frame durations. The usability of such a thing is vanishingly small, especially since we cannot determine it with any amount of reliability. Therefore get rid of it after the next bump. Replace it with the average framerate where it makes sense. FATE results for the wtv and xmv demux tests change. In the wtv case this is caused by the file being corrupted (or possibly badly cut) and containing invalid timestamps. This results in lavf estimating the framerate wrong and making up wrong frame durations. In the xmv case the file contains pts jumps, so again the estimated framerate is far from anything sane and lavf again makes up different frame durations. In some other tests lavf starts making up frame durations from different frame.