aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-301-8/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: drop ff_h264_ prefix from static function ff_h264_decode_rbsp_trailing() h264: Make ff_h264_decode_end() static, it is not used externally. output-example: K&R formatting cosmetics, comment spelling fixes avf: make the example output the proper message avf: fix audio writing in the output-example mov: don't overwrite existing indexes. lzw: fix potential integer overflow. truemotion: forbid invalid VLC bitsizes and token values. truemotion2: handle out-of-frame motion vectors through edge extension. configure: Check for a different SDL function Conflicts: configure doc/examples/muxing.c libavcodec/truemotion2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * output-example: K&R formatting cosmetics, comment spelling fixesDiego Biurrun2012-03-301-97/+100
| |
| * avf: make the example output the proper messageLuca Barbato2012-03-291-2/+2
| | | | | | | | | | av_dump_format needs the codecs opened in order to print them.
| * avf: fix audio writing in the output-exampleLuca Barbato2012-03-291-1/+1
| | | | | | | | | | av_init_packet does not reset data and size fields in AVPacket, avcodec_encode_audio2 can use preallocated AVPacket.
| * mov: don't overwrite existing indexes.Ronald S. Bultje2012-03-291-8/+11
| | | | | | | | | | | | | | | | Prevents all kind of badness if files contain multiple indexes. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | libavformat: Fix several "incompatible pointer type" warnings.Michael Niedermayer2012-03-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-301-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mp3dec: perform I/S and M/S only when frame mode is joint stereo. id3v2: add another mimetype for JPEG image lzw: prevent buffer overreads. WMAL: Remove inaccurate and unnecessary doxy h264: fix cabac-on-stack after safe cabac reader. truemotion2: convert packet header reading to bytestream2. Conflicts: libavcodec/lzw.c libavcodec/truemotion2.c libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * id3v2: add another mimetype for JPEG imageKostya Shishkov2012-03-291-0/+1
| |
* | img2dec: remove GLOB_TILDE support.Michael Niedermayer2012-03-301-7/+1
| | | | | | | | | | | | | | tilde expansion should/can be done by the shell Reviewed-by: Alexander Strasser <eclipse7@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2dec: Recognize glob meta chars only if prefixed by %Alexander Strasser2012-03-301-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes globbing support to only be used if the character contains at least one glob meta character that is preceded by an unescaped %. To escape a literal % one would use %% which is identical to the way to match a % with image2 sequence generation feature. * Makes it possible to have patterns like %04d-[720p].jpg work again with sequence number generation. Previously this would always be detected as a glob pattern and was interpreted by the image2 glob code instead. * Makes it possible to use %*-[720p].jpg to match above pattern without having to double escape it to be not interpreted by most shells and not by the image2 glob code (previously one would need to use \*-\\\[720p\\\].jpg to achieve the same) Signed-off-by: Alexander Strasser <eclipse7@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2: glob matching for image seriesBrian Olson2012-03-301-2/+70
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: print ts values in pts < dts error messageMichael Niedermayer2012-03-291-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-2911-25/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: asf: only set index_read if the index contained entries. cabac: add overread protection to BRANCHLESS_GET_CABAC(). cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC(). cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE(). cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC(). h264: add overread protection to get_cabac_bypass_sign_x86(). h264: reindent get_cabac_bypass_sign_x86(). h264: use struct offsets in get_cabac_bypass_sign_x86(). h264: fix overreads in cabac reader. wmall: fix seeking. lagarith: fix buffer overreads. dvdec: drop unnecessary dv_tablegen.h #include build: fix doc generation errors in parallel builds Replace memset(0) by zero initializations. faandct: Remove FAAN_POSTSCALE define and related code. dvenc: print allowed profiles if the video doesn't conform to any of them. avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size. FATE: add a test for vp8 with changing frame size. fate: add kgv1 fate test. oggdec: calculate correct timestamps in Ogg/FLAC Conflicts: libavcodec/4xm.c libavcodec/cook.c libavcodec/dvdata.c libavcodec/dvdsubdec.c libavcodec/lagarith.c libavcodec/lagarithrac.c libavcodec/utils.c tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asf: only set index_read if the index contained entries.Ronald S. Bultje2012-03-281-1/+1
| | | | | | | | | | This allows falling back to a binary search if the file contains no index, thus fixing seeking in such files (e.g. luckynight.wma).
| * Replace memset(0) by zero initializations.Diego Biurrun2012-03-289-24/+12
| | | | | | | | Also remove one pointless zero initialization in rangecoder.c.
| * oggdec: calculate correct timestamps in Ogg/FLACJustin Ruggles2012-03-271-0/+1
| | | | | | | | | | We need to parse the individual packet durations when there is more than one packet in a page.
| * westwood_vqa: fix SND0 chunk handlingPaul B Mahol2012-03-271-63/+71
| | | | | | | | | | | | | | | | Version from vqa header does not dictate which sound chunks may appear in file. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * westwood_vqa: set video stream durationPaul B Mahol2012-03-271-0/+2
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | id3v2: support JPEG APIC with incorrect (image/jpg) MIME typePiotr Bandurski2012-03-281-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support FLIC in AVI.Paul B Mahol2012-03-281-0/+1
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oma: dont over-read bufferMichael Niedermayer2012-03-271-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-273-18/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: make av_interleaved_write_frame() flush packets when pkt is NULL mpegts: Fix dead error checks vc1: Do not read from array if index is invalid. targa: convert to bytestream2. rv34: set mb_num_left to 0 after finishing a frame Conflicts: libavcodec/targa.c libavcodec/vc1data.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * make av_interleaved_write_frame() flush packets when pkt is NULLJindrich Makovicka2012-03-272-12/+20
| | | | | | | | | | | | | | | | This patch allows the user to force flushing of all queued packets by calling av_interleaved_write_frame() with pkt set to NULL. Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv> Signed-off-by: Martin Storsjö <martin@martin.st>
| * mpegts: Fix dead error checksAlex Converse2012-03-261-6/+12
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-263-17/+109
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: ppc: drop stray leftover backslash build: Only clean the architecture subdirectory we build for. build: drop some unnecessary dependencies from the H.264 parser build: prettyprinting cosmetics libavutil: Remove pointless rational test program. libavutil: Remove broken and pointless lzo test program. lavf doxy: expand AVStream.codec doxy. lavf doxy: improve AVStream.time_base doxy. lavf doxy: add some basic documentation about reading from the demuxer. lavf doxy: document passing options to demuxers. lavf doxy: clarify that an AVPacket contains encoded data. mpegtsenc: allow user triggered PES packet flushing APIchanges: mark the place where 0.7 was cut. APIchanges: mark the place where 0.8 was cut. APIchanges: fill in missing dates and hashes. smacker: convert palette and header reading to bytestream2. alac: convert extradata reading to bytestream2. Conflicts: doc/APIchanges libavcodec/smacker.c libavcodec/x86/Makefile libavfilter/Makefile libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: prettyprinting cosmeticsDiego Biurrun2012-03-261-2/+2
| |
| * lavf doxy: expand AVStream.codec doxy.Anton Khirnov2012-03-261-1/+12
| |
| * lavf doxy: improve AVStream.time_base doxy.Anton Khirnov2012-03-261-3/+5
| | | | | | | | | | Remove confusing sentence that implied the user should set the timebase. Elaborate on how the timebase is set for muxing.
| * lavf doxy: add some basic documentation about reading from the demuxer.Anton Khirnov2012-03-261-0/+16
| |
| * lavf doxy: document passing options to demuxers.Anton Khirnov2012-03-261-0/+41
| |
| * lavf doxy: clarify that an AVPacket contains encoded data.Anton Khirnov2012-03-261-2/+2
| |
| * mpegtsenc: allow user triggered PES packet flushingJindrich Makovicka2012-03-261-9/+31
| | | | | | | | | | Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Enable generic index/seeking for mgsts demuxer.Reimar Döffinger2012-03-261-0/+3
| | | | | | | | | | | | | | This depends on the proposed parser change for 0-size packets in previous mail, otherwise video now plays far too fast. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Handle 0-size sync packets when only parsing headers.Reimar Döffinger2012-03-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Currently, the duration of those packets is just discarded when enabling parsing, thus the output of the Metal Gear Solid demuxer breaks completely when just setting AVSTREAM_PARSE_HEADERS. The result will not be correct if a parser creates a delay even with PARSER_FLAG_COMPLETE_FRAMES and there might be other cases where it does not work correct, but just discarding them as it is done currently seems worse. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Support FLIC in MOV.Reimar Döffinger2012-03-261-0/+1
| | | | | | | | | | | | Fixes trac issue #626. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | mxfdec: fix off by one error.Michael Niedermayer2012-03-261-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: pass correct context to av_timecode_init()Michael Niedermayer2012-03-261-2/+2
| | | | | | | | | | fixes null ptr dereference Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-251-5/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: dsputil: prettyprint gcc inline asm x86: K&R prettyprinting cosmetics for dsputil_mmx.c x86: conditionally compile H.264 QPEL optimizations dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks. Ignore generated files below doc/. dpcm: convert to bytestream2. interplayvideo: convert to bytestream2. movenc: Merge if statements h264: fix memleak in error path. pthread: Immediately release all frames in ff_thread_flush() h264: Add check for invalid chroma_format_idc utvideo: port header reading to bytestream2. Conflicts: .gitignore configure libavcodec/h264_ps.c libavcodec/interplayvideo.c libavcodec/pthread.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Merge if statementsMartin Storsjö2012-03-251-5/+2
| | | | | | | | | | | | | | | | This isn't exactly equivalent with the earlier code for codecs other than H264 and VC1, but those are two only codecs supported by this codepath anyway, and it simplifies it a bit. Signed-off-by: Martin Storsjö <martin@martin.st>
* | "Metal Gear Solid: The Twin Snakes" demuxerPaul B Mahol2012-03-254-1/+106
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: fix heap buffer overflowMichael Niedermayer2012-03-251-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-254-25/+48
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avc: Add a function for converting mp4 style extradata to annex b pthread: free progress if buffer allocation failed. lavc/avconv: support changing frame sizes in codecs with frame mt. libavformat: Document who sets the AVStream.id field utvideo: mark output picture as keyframe. sunrast: Add support for negative linesize. vp8: fix update_lf_deltas in libavcodec/vp8.c ralf: read Huffman code lengths without GetBitContext Conflicts: ffmpeg.c libavcodec/sunrastenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avc: Add a function for converting mp4 style extradata to annex bMartin Storsjö2012-03-243-24/+42
| | | | | | | | | | | | | | Make movenc use this function instead of the current custom conversion function. Signed-off-by: Martin Storsjö <martin@martin.st>
| * libavformat: Document who sets the AVStream.id fieldMartin Storsjö2012-03-241-1/+6
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | xmv: check channel numberMichael Niedermayer2012-03-231-0/+5
| | | | | | | | | | | | | | Fixes FPE Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: Fix FPE on 0 time_scaleMichael Niedermayer2012-03-231-1/+2
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vorbisdemux: Check private context in theoras gtopts.Michael Niedermayer2012-03-232-3/+11
| | | | | | | | | | | | | | | | | | This prevents a null ptr dereference. It could be checked differently but this way it should be possible to return some data. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: fix strcmp(NULL)Michael Niedermayer2012-03-231-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: fix global unicode convertion array overflow.Michael Niedermayer2012-03-231-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mmdemux: dont set pkt->size to an invalid value.Michael Niedermayer2012-03-231-1/+0
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 20:21:21 +0000