aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-224-1/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: xwma: Validate channels and bits_per_coded_sample. mov: Do not read past the end of the ctts_data table. mov: Add missing terminator to mov_ch_layout_map_1ch. asf: reset side data elements on packet copy. wmavoice: fix stack overread. wmalossless: error out if a subframe is not used by any channel. vqa: check palette chunk size before reading data. wmalossless: reset sample pointer for each subframe. wmalossless: error out on invalid values for order. Conflicts: libavcodec/vqavideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xwma: Validate channels and bits_per_coded_sample.Alex Converse2012-03-221-0/+11
| | | | | | | | | | | | | | This prevents a SIGFPE later on. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * mov: Do not read past the end of the ctts_data table.Alex Converse2012-03-221-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * mov: Add missing terminator to mov_ch_layout_map_1ch.Alex Converse2012-03-221-0/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: Libav-stable@libav.org
| * asf: reset side data elements on packet copy.Ronald S. Bultje2012-03-221-0/+2
| | | | | | | | | | | | | | Prevents crash (double free) when free()ing the original packet. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-221-17/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: FATE: Add ZeroCodec test oggparseogm: fix order of arguments of avpriv_set_pts_info(). pngenc: better upper bound for encoded frame size. aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C aiffdec: do not set bit rate if block duration is unknown wmall: output packet only if we have decoded some samples Conflicts: libavcodec/pngenc.c tests/fate/lossless-video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparseogm: fix order of arguments of avpriv_set_pts_info().Michael Niedermayer2012-03-221-1/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-CJustin Ruggles2012-03-221-0/+7
| |
| * aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFFJustin Ruggles2012-03-221-13/+8
| |
| * aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-CJustin Ruggles2012-03-221-5/+4
| |
| * aiffdec: do not set bit rate if block duration is unknownJustin Ruggles2012-03-221-2/+4
| | | | | | | | CC: libav-stable@libav.org
* | udp: lock all operations on shared variables.Nicolas George2012-03-221-5/+6
| |
* | udp: return the error code instead of generic EIO.Nicolas George2012-03-221-1/+1
| |
* | udp: call av_fifo_space directly as needed.Nicolas George2012-03-221-6/+2
| | | | | | | | | | The comment seemed to indicate that left was used to limit the size of the recv, but it was not so.
* | udp: use non-blocking read instead of select.Nicolas George2012-03-221-20/+1
| |