summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-05
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: qcelpdec: cosmetics: do not add line break before opening bracket in 'for', 'while', 'if/else', and 'switch' statements. qcelp: check output buffer size before decoding qcelpdec: fix the return value of qcelp_decode_frame(). sipr: fix the output data size check and only calculate it once. Synchronize various 4CCs and codec tags from FFmpeg. qdm2: check output buffer size before decoding Fix out of bound reads in the QDM2 decoder. Check for out of bound writes in the QDM2 decoder. ogg/celt: do not set sample_fmt in the demuxer Conflicts: libavcodec/avcodec.h libavcodec/qdm2.c libavformat/oggparsecelt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Synchronize various 4CCs and codec tags from FFmpeg.Diego Biurrun2011-10-04
| |
| * ogg/celt: do not set sample_fmt in the demuxerJustin Ruggles2011-10-03
| |
* | Add libmodplug support.Clément Bœsch2011-10-04
| |
* | isom: replace pseudo doxycomments with normal comments.Clément Bœsch2011-10-04
| | | | | | | | | | Those chunks don't need to be parsed and they weren't parsed correctly by Doxygen anyway.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: id3v2: remove pointless casts id3v2: read TXXX frames with two calls to decode_str() instead of one. id3v2: don't discard the whole tag when encountering empty frames. libvpx: fix build with older libvpx versions. ARM: check for inline asm 'y' operand modifier support Conflicts: libavcodec/libvpxenc.c libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * id3v2: remove pointless castsAnton Khirnov2011-10-03
| |
| * id3v2: read TXXX frames with two calls to decode_str() instead of one.Anton Khirnov2011-10-03
| | | | | | | | | | | | | | Read the key in the first, value in the second. This allows to avoid pointless strdups and simplify decode_str() by dropping two of its parameters.
| * id3v2: don't discard the whole tag when encountering empty frames.Anton Khirnov2011-10-03
| | | | | | | | | | While they're technically invalid, it's better to skip them and try to read the rest of the tag.
* | lavf/utils: fix overestimation of the rational number density.Michael Niedermayer2011-10-03
| | | | | | | | | | | | Fixes Ticket498 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegtsenc: Lift limit on PMT PIDLoren Osborn2011-10-03
| | | | | | | | Fixes Ticket518
* | riff: map 0x0038 to amrnb, works on http://video.mopoto.com/4/40/407/40709.aviCompn2011-10-02
| |
* | Fix use of uninitialized memory in 4X Technologies demuxer.Laurent Aimar2011-10-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avienc: Add a limit on the number of skiped frames muxed in a row.Michael Niedermayer2011-10-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (34 commits) dpcm: return error if packet is too small dpcm: use smaller data types for static tables dpcm: use sol_table_16 directly instead of through the DPCMContext. dpcm: replace short with int16_t dpcm: check to make sure channels is 1 or 2. dpcm: misc pretty-printing dpcm: remove unnecessary variable by using bytestream functions. dpcm: move codec-specific variable declarations to their corresponding decoding blocks. dpcm: consistently use the variable name 'n' for the next input byte. dpcm: output AV_SAMPLE_FMT_U8 for Sol DPCM subcodecs 1 and 2. dpcm: calculate and check actual output data size prior to decoding. dpcm: factor out the stereo flag calculation dpcm: cosmetics: rename channel_number to ch avserver: Fix a bug where the socket is IPv4, but IPv6 is autoselected for the loopback address. lavf: Avoid using av_malloc(0) in av_dump_format dxva2_h264: pass the correct 8x8 scaling lists dca: NEON optimised high freq VQ decoding avcodec: reject audio packets with NULL data and non-zero size dxva: Add ability to enable workaround for older ATI cards latmenc: Set latmBufferFullness to largest value to indicate it is not used ... Conflicts: libavcodec/dxva2_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Avoid using av_malloc(0) in av_dump_formatMartin Storsjö2011-09-30
| | | | | | | | | | | | | | On OS X, av_malloc(0) returns pointers that cause crashes when freed. Signed-off-by: Martin Storsjö <martin@martin.st>
| * latmenc: Set latmBufferFullness to largest value to indicate it is not usedKieran Kunhya2011-09-30
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mpeg probe: check the 2/4-bit synchronization value found after a ↵Alex Converse2011-09-29
| | | | | | | | pack_start_code.
* | Fix double free on error in Deluxe Paint Animation demuxer.Laurent Aimar2011-10-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Check for out of bound writes in the avs demuxer.Laurent Aimar2011-10-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Check for corrupted data in avs demuxer.Laurent Aimar2011-10-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat_free_context: favor av_freep()Michael Niedermayer2011-10-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggenc: favor av_freep()Michael Niedermayer2011-10-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/utils: Drop old hack for implicit HE-AAC signaling.Alex Converse2011-09-30
| | | | | | | | | | | | It has not been needed since a58858d60d37c7abfcea11bb387909bf9cd4916d. Fixes decode of implicit HE-AAC without extradata or ADTS headers.
* | lavf/utils: ignore subtitle timestamps in timings calculationMichael Niedermayer2011-09-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix memory leak in oggencMaksym Veremeyenko2011-09-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | g723_1_demuxer: rco is also a commonly used extension.Michael Niedermayer2011-09-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: Only touch extradata in mov_read_extradata() if codec_id is what we expectTomas Härdin2011-09-29
| | | | | | | | | | | | | | Extradata should only be parsed from the avss, fiel, jp2h and alac atoms for AVS, MJPEG, Motion JPEG 2000 and ALAC respectively. This also fixes the mov demuxer coming up with bogus extradata for some AVC-Intra samples due to the presence of fiel atoms.
* | add LJ2K and LJ2C to jpeg2000 decoderCompn2011-09-29
| | | | | | | | works on http://web.archive.org/web/20070128115405/http://www.leadcodecs.com/Download/MJ2K/WhatBox_MJ2k_720x480_PerfectQuality2.avi
* | Add the G723.1 demuxer and decoderMohamed Naufal Basheer2011-09-29
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) avconv: Reformat s16 volume adjustment. ARM: NEON optimised vector_fmac_scalar() dca: use vector_fmac_scalar from dsputil dsputil: add vector_fmac_scalar() latmenc: Fix private options vf_unsharp: store hsub/vsub in the filter context vf_unsharp: adopt a more natural order of params in apply_unsharp() vf_unsharp: rename method "unsharpen" to "apply_unsharp" vf_scale: apply the same transform to the aspect during init that is applied per frame vf_pad: fix "vsub" variable value computation vf_scale: add a "sar" variable lavfi: fix realloc size computation in avfilter_add_format() vsrc_color: use internal timebase lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() graphparser: prefer void * over AVClass * for log contexts avfiltergraph: use meaningful error codes avconv: Initialize return value for codec copy path. fate: use 'run' helper for seek-test fate: remove seek-mpeg2reuse test Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080. ... Conflicts: doc/filters.texi libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/graphparser.c libavfilter/vf_scale.c libavfilter/vsrc_color.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * latmenc: Fix private optionsKieran Kunhya2011-09-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.Michael Niedermayer2011-09-27
| | | | | | | | | | | | | | | | | | | | | | | | | | Whitespace of the patch cleaned up by Aurel Some of the issues have been reported by Steve Manzuik / Microsoft Vulnerability Research (MSVR) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 956c901c68eff78288f40e3c8f41ee2fa081d4a8) Further suggestions from Kostya <kostya.shishkov@gmail.com> have been implemented by Reinhard Tartler <siretart@tauware.de> Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* | movenc: Replace av_realloc by av_realloc_f when relevant.Nicolas George2011-09-28
| | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | gxfenc: Replace av_realloc by av_realloc_f when relevant.Nicolas George2011-09-28
| | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aviobuf: Replace av_realloc by av_realloc_f when relevant.Nicolas George2011-09-28
| | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avienc: Replace av_realloc by av_realloc_f when relevant.Nicolas George2011-09-28
| | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: Replace av_realloc by av_realloc_f when relevant.Nicolas George2011-09-28
| | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 4xm: Replace av_realloc by av_realloc_f when relevant.Nicolas George2011-09-28
| | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bintext: remove unused variable.Nicolas George2011-09-28
| | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: use different variables for decoded and filtered frame. avconv: add support for copying attachments. matroskaenc: write attachments. matroskadec: export mimetype of attachments as metadata. avconv: factorize common code from new_*_stream() doc/avconv: expand documentation for some options. doc/avconv: document -timelimit. Conflicts: avconv.c cmdutils.c tests/codec-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: write attachments.Anton Khirnov2011-09-27
| |
| * matroskadec: export mimetype of attachments as metadata.Anton Khirnov2011-09-27
| |
* | mxf: Add PictureEssenceCoding UL for V210Tomas Härdin2011-09-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2enc: show first 4 bytes if a malformed jpeg2000 codestream is detectedMichael Niedermayer2011-09-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2enc: Accept raw jpeg2000 codestream too,Michael Niedermayer2011-09-27
| | | | | | | | | | | | our decoder outputs that, jasper can as well Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Consider QuantizationBits between 17 and 24 to be pcm_s24*Tomas Härdin2011-09-27
| | | | | | | | | | | | This fixes playback of BRD38772509.mxf Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swfdec: return correct error code at EOFTanami, Ohad2011-09-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) fate: allow testing with libavfilter disabled x86: XOP/FMA4 CPU detection support ws_snd: misc cosmetic clean-ups ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead. ws_snd: use memcpy() and memset() instead of loops ws_snd: use samples pointer for loop termination instead of a separate iterator variable. ws_snd: make sure number of channels is 1 ws_snd: add some checks to prevent buffer overread or overwrite. ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16. flacdec: fix buffer size checking in get_metadata_size() rtp: Simplify ff_rtp_get_payload_type rtpenc: Add a payload type private option rtp: Correct ff_rtp_get_payload_type documentation avconv: replace all fprintf() by av_log(). avconv: change av_log verbosity from ERROR to FATAL for fatal errors. cmdutils: replace fprintf() by av_log() avtools: parse loglevel before all the other options. oggdec: add support for Xiph's CELT codec sol: return error if av_get_packet() fails. cosmetics: reindent and pretty-print ... Conflicts: avconv.c cmdutils.c libavcodec/avcodec.h libavcodec/version.h libavformat/oggparsecelt.c libavformat/utils.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtp: Simplify ff_rtp_get_payload_typeRafaël Carré2011-09-26
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 18:45:00 +0000