summaryrefslogtreecommitdiff
path: root/libavformat/electronicarts.c
Commit message (Collapse)AuthorAge
* electronicarts: demux alpha streamPeter Ross2015-06-25
| | | | | | | | | 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>
* electronicarts: move video stream properties into dedicated structurePeter Ross2015-06-25
| | | | | | | 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>
* avformat/electronicarts: Fixed ea_probe function to accept vp6a videosStephan Vedder2015-06-23
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Correct few "ffmpeg" typosPaul B Mahol2014-08-24
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421'Michael Niedermayer2014-08-22
|\ | | | | | | | | | | | | * commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421': electronicarts: set the framerate for TGQ/TQI Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: set the framerate for TGQ/TQIAnton Khirnov2014-08-22
| | | | | | | | It is hardcoded to 15fps.
* | Merge commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136'Michael Niedermayer2014-08-22
|\| | | | | | | | | | | | | * commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136': electronicarts: read the framerate for MAD Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: read the framerate for MADAnton Khirnov2014-08-22
| |
* | Merge commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b'Michael Niedermayer2014-08-22
|\| | | | | | | | | | | | | | | | | | | * commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b': electronicarts: do not fail on zero-sized chunks Conflicts: libavformat/electronicarts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: do not fail on zero-sized chunksAnton Khirnov2014-08-22
| | | | | | | | | | | | | | 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
* | replace calls to url_feof() with avio_feof()James Almer2014-08-08
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'Michael Niedermayer2014-03-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-11
| |
* | avformat/electronicarts: detect endianness by comparing sizes instead of ↵Michael Niedermayer2013-12-21
| | | | | | | | | | | | using an arbitrary threshold Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/electronicarts: use 64bit variable for avio_tell() resultMichael Niedermayer2013-12-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/electronicarts: check chunksize more completely in probe()Michael Niedermayer2013-11-11
| | | | | | | | | | | | Fixes probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/electronicarts: check chunk size.Michael Niedermayer2013-11-11
| | | | | | | | | | | | Fix infinite loop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a9221e39600a31ee13e736e9e47743cde23f0280'Michael Niedermayer2013-09-29
|\| | | | | | | | | | | | | | | * 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>
| * electronicarts: Add more sanity checking for the number of channelsMartin Storsjö2013-09-29
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f7e616959aff8706edccdae763c24c897c449f6f'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f7e616959aff8706edccdae763c24c897c449f6f': electronicarts: Check packet sizes before reading Conflicts: libavformat/electronicarts.c See: fb1ea777b3a01be6d71a103529ad37982707cacc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: Check packet sizes before readingMartin Storsjö2013-09-22
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '163a729725c6eb0081b0af41a7279f7d19aee86e'Michael Niedermayer2013-08-16
|\| | | | | | | | | | | | | * commit '163a729725c6eb0081b0af41a7279f7d19aee86e': electronicarts: Let functions always returning the same value return void Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: Let functions always returning the same value return voidDiego Biurrun2013-08-15
| |
* | Merge commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529'Michael Niedermayer2013-08-16
|\| | | | | | | | | | | | | | | | | | | * commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529': electronicarts: Improve some function/variable names Conflicts: libavformat/electronicarts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: Improve some function/variable namesDiego Biurrun2013-08-15
| |
* | Merge commit 'a90cff137b2aca89380b0acad41cd7bb05619ece'Michael Niedermayer2013-08-16
|\| | | | | | | | | | | | | * commit 'a90cff137b2aca89380b0acad41cd7bb05619ece': electronicarts: comment wording fixes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: comment wording fixesDiego Biurrun2013-08-15
| |
* | Merge commit '288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c'Michael Niedermayer2013-08-16
|\| | | | | | | | | | | | | * commit '288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c': electronicarts: Remove bogus function documentation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: Remove bogus function documentationDiego Biurrun2013-08-15
| |
* | Merge commit '8747fce91fca6bb8e9936497f2de05c905cf43b5'Michael Niedermayer2013-08-16
|\| | | | | | | | | | | | | | | | | | | * commit '8747fce91fca6bb8e9936497f2de05c905cf43b5': electronicarts: K&R formatting cosmetics Conflicts: libavformat/electronicarts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: K&R formatting cosmeticsDiego Biurrun2013-08-15
| |
| * lavf: remove disabled FF_API_R_FRAME_RATE cruftAnton Khirnov2013-03-11
| |
* | electronicarts: check timebase, fix assertion failureMichael Niedermayer2013-03-28
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc & lavf: replace deprecated av_log* functionsPaul B Mahol2013-03-15
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | electronicarts: check size before reading duration out of a chunk.Michael Niedermayer2012-11-17
| | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | electronic arts: support rare samples containing adpcm_ea_r1 audioPeter Ross2012-11-11
| | | | | | | | | | | | | | Fixes ticket #1549. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | electronicarts: use av_log_ask_for_samplePeter Ross2012-11-11
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-07
| |
* | Replace various inlined inverse AVRational with av_inv_q().Clément Bœsch2012-08-06
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avformat: Drop pointless "format" from container long namesDiego Biurrun2012-07-30
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavf: deprecate r_frame_rate.Anton Khirnov2012-07-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: tests: Refactor rotozoom/videogen common code into a separate file. tests: Mark some file-internal symbols as static. build: Drop leftover .exp pattern from LIBSUFFIXES list. vsrc_buffer: return EAGAIN if no frame is available. WMAL: Shift output samples by the specified number of padding zeroes. WMAL: Restore removed code in mclms_predict() rtpdec_h264: Remove a useless ifdef rtpdec_h264: Remove outdated/useless/incorrect comments rtpdec_h264: Remove useless memory corruption checks rtpdec_h264: Return proper error codes rtpdec_h264: Check the available data length before reading rtpdec_h264: Add input size checks png: check bit depth for PAL8/Y400A pixel formats. ea: check chunk_size for validity. celp filters: Do not read earlier than the start of the 'out' vector. Conflicts: libavcodec/pngdec.c libavfilter/src_buffer.c tests/rotozoom.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ea: check chunk_size for validity.Ronald S. Bultje2012-05-04
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | electronicarts vp6: set duration of video streamPaul B Mahol2012-03-22
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: tiertexseq: set correct block_align for audio tiertexseq: set audio stream start time to 0 voc/avs: Do not change the sample rate mid-stream. segafilm: use the sample rate as the time base for audio streams ea: fix audio pts psx-str: fix audio pts vqf: set packet duration tta demuxer: set packet duration mpegaudio_parser: do not ignore information from the first parsed frame mpegaudio_parser: be less picky about the start position thp: set audio packet durations avcodec: add a Vorbis parser to get packet duration vorbisdec: read the previous window flag for long windows lavc: free the output packet when encoding failed or produced no output. lavc: preserve avpkt->destruct in ff_alloc_packet(). lavc: clarify the meaning of AVCodecContext.frame_number. mpegts: Pad the packet buffer in handle_packet(). mpegts: Do not call read_sl_header() when no bytes remain in the buffer. Conflicts: libavcodec/mpegaudio_parser.c libavcodec/version.h libavformat/mpegts.c tests/ref/fate/pva-demux Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ea: fix audio ptsJustin Ruggles2012-03-03
| | | | | | | | | | | | | | The time base is 1 / sample_rate, not 90000. Several more codecs encode the sample count in the first 4 bytes of the chunk, so we set the durations accordingly. Also, we can set start_time and packet duration instead of keeping track of the sample count in the demuxer.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) amrwb: remove duplicate arguments from extrapolate_isf(). amrwb: error out early if mode is invalid. h264: change underread for 10bit QPEL to overread. matroska: check buffer size for RM-style byte reordering. vp8: disable mmx functions with sse/sse2 counterparts on x86-64. vp8: change int stride to ptrdiff_t stride. wma: fix invalid buffer size assumptions causing random overreads. Windows Media Audio Lossless decoder rv10/20: Fix slice overflow with checked bitstream reader. h263dec: Disallow width/height changing with frame threads. rv10/20: Fix a buffer overread caused by losing track of the remaining buffer size. rmdec: Honor .RMF tag size rather than assuming 18. g722: Fix the QMF scaling r3d: don't set codec timebase. electronicarts: set timebase for tgv video. electronicarts: parse the framerate for cmv video. ogg: don't set codec timebase electronicarts: don't set codec timebase avs: don't set codec timebase wavpack: Fix an integer overflow ... Conflicts: libavcodec/arm/vp8dsp_init_arm.c libavcodec/fraps.c libavcodec/h264.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/msmpeg4.c libavcodec/pnmdec.c libavcodec/qpeg.c libavcodec/rawenc.c libavcodec/ulti.c libavcodec/vcr1.c libavcodec/version.h libavcodec/wmalosslessdec.c libavformat/electronicarts.c libswscale/ppc/yuv2rgb_altivec.c tests/ref/acodec/g722 tests/ref/fate/ea-cmv Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 00:41:20 +0000