summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795'Michael Niedermayer2013-04-11
|\ | | | | | | | | | | | | | | | | | | | | * commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795': img2enc: add an option for overwriting one file with subsequent images Conflicts: doc/muxers.texi libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * img2enc: add an option for overwriting one file with subsequent imagesAnton Khirnov2013-04-11
| | | | | | | | Based on a patch by Michael Niedermayer <michaelni@gmx.at>.
* | avienc: fix overflow of audio sample countTobias Rapp2013-04-11
| | | | | | | | | | | | | | Fixes an overflow of the sample count field within the audio stream header chunk if audio stream data exceeds 2GB. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avisynth: Don't insert null frames or samples at the start of a stream.Stephen Hutchinson2013-04-11
| | | | | | | | | | | | This is the last remaining issue from ticket #2412 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Move misplaced file author information where it belongs Conflicts: libavcodec/adpcm.c libavcodec/adpcmenc.c libavcodec/gif.c libavcodec/x86/dsputilenc_mmx.c libavcodec/x86/fmtconvert_init.c libavformat/au.c libavformat/gif.c libavformat/mov.c libavformat/nsvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move misplaced file author information where it belongsDiego Biurrun2013-04-11
| |
* | mxfdec: update current edit unit when seeking in mxf files without index tablesMarton Balint2013-04-11
| | | | | | | | | | | | | | | | Fixes audio packet pts values in some files generated by AVID TRMG 3.01. Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add libquvi demuxer.Clément Bœsch2013-04-10
| |
* | Replace all occurrences of PRI in sscanf() calls with SCNJames Almer2013-04-10
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/avisynth: Cosmeticsd s2013-04-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avisynth: Fix off-by-one error in avisynth demuxer.d s2013-04-10
| | | | | | | | | | | | Fixes ticket #2412. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-09
|\| | | | | | | | | | | | | | | | | | | * qatar/master: srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTH rtpdec: Increase max rtp packet size to 8192 lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500 h264pred: Add a few missing const declarations for ff_cropTbl derived pointers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTHMartin Storsjö2013-04-09
| | | | | | | | | | | | | | This was missed from 350ad50b - this fixes building the fate-srtp test. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec: Increase max rtp packet size to 8192Andrew Van Til2013-04-09
| | | | | | | | | | | | This fixes connecting to "Ceton InfiniTV4 PCIe & USB". Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500Andrew Van Til2013-04-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/wavdec: skip padding byteMatthieu Bouron2013-04-08
| | | | | | | | | | | | | | | | | | | | WAV chunks must be even aligned. This patch skip the extra padding byte if chunk size is odd. Fixes ticket #2417. Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rtsp: add option to set the socket timeout of the lower protocol.Michael Niedermayer2013-04-08
| | | | | | | | | | | | Fixes Ticket2294 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avio.h: fix indentionMichael Niedermayer2013-04-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'mbouron/master'Michael Niedermayer2013-04-08
|\ \ | | | | | | | | | | | | | | | | | | * mbouron/master: lavf/mxfdec: handle identification metadata Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/mxfdec: handle identification metadataMatthieu Bouron2013-04-08
| | |
* | | flvenc: dont call avio_flush() unconditionalMichael Niedermayer2013-04-08
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | mux: also call avio_flush() when flushing the muxerMichael Niedermayer2013-04-08
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat: add writeout_count statisticMichael Niedermayer2013-04-08
|/ / | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfenc: convert asserts to av_assertMichael Niedermayer2013-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/http: use a more compatible default user agent.Clément Bœsch2013-04-06
| | | | | | | | Fixes Ticket 2265.
* | img2dec: make use of AV_OPT_TYPE_IMAGE_SIZEPaul B Mahol2013-04-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | img2dec: make use of AV_OPT_TYPE_VIDEO_RATEPaul B Mahol2013-04-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | rawvideodec: make use of AV_OPT_TYPE_IMAGE_SIZEPaul B Mahol2013-04-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | rawvideodec: make use of AV_OPT_TYPE_VIDEO_RATEPaul B Mahol2013-04-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | rawdec: make use of AV_OPT_TYPE_VIDEO_RATEPaul B Mahol2013-04-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | bintext: make use of AV_OPT_TYPE_IMAGE_SIZEPaul B Mahol2013-04-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | bintext: make use of AV_OPT_TYPE_VIDEO_RATEPaul B Mahol2013-04-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | tty: make use of AV_OPT_TYPE_IMAGE_SIZEPaul B Mahol2013-04-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | tty: make use of AV_OPT_TYPE_VIDEO_RATEPaul B Mahol2013-04-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '8c65264595d5a82c56ae5043320e4b875a414229'Michael Niedermayer2013-04-05
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '8c65264595d5a82c56ae5043320e4b875a414229': pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values img2: Add j2k file extension for JPEG 2000 Conflicts: libavutil/pixfmt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * img2: Add j2k file extension for JPEG 2000Nicolas Bertrand2013-04-04
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | rtpdec: Increase max rtp packet size to 8192Andrew Van Til2013-04-05
| | | | | | | | | | | | | | Fixes Ticket2314 Fixes connecting to "Ceton InfiniTV4 PCIe & USB" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rtsp/rtp_read_header: Use RTP_MAX_PACKET_LENGTH instead of 1500Andrew Van Til2013-04-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: Check EBML lace sizes.Michael Niedermayer2013-04-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: Check for overflows in xiph lace decodingMichael Niedermayer2013-04-04
| | | | | | | | | | | | This also detects errors earlier Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: fix return code for too long xiph lacesMichael Niedermayer2013-04-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-04
|\| | | | | | | | | | | | | * qatar/master: xmv: do not leak memory in the error paths in xmv_read_header() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xmv: do not leak memory in the error paths in xmv_read_header()Anton Khirnov2013-04-04
| | | | | | | | CC: libav-stable@libav.org
* | Merge commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c'Michael Niedermayer2013-04-04
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c': xmv: check audio track parameters validity. bmv: check for len being valid in bmv_decode_frame(). Conflicts: libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xmv: check audio track parameters validity.Anton Khirnov2013-04-04
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '8d617b11cfc87b2c6056fee029ac5bc760af874a'Michael Niedermayer2013-04-04
|\| | | | | | | | | | | | | | | | | | | | | * commit '8d617b11cfc87b2c6056fee029ac5bc760af874a': id3v2: pad the APIC packets as required by lavc. dfa: check for invalid access in decode_wdlt(). Conflicts: libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * id3v2: pad the APIC packets as required by lavc.Anton Khirnov2013-04-04
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'Michael Niedermayer2013-04-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dbb1425811a672eddf4acf0513237cdf20f83756': lavf: make sure stream probe data gets freed. avfiltergraph: set deprecated filter_count. Conflicts: libavformat/utils.c See: 44a7a6300d104dd453bcd5c601e9c6944fb34679 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: make sure stream probe data gets freed.Anton Khirnov2013-04-04
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b'Michael Niedermayer2013-04-04
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'bcc94328980e6c56546792ab08b0756abdce310b': opt: check the return values of av_get_token for ENOMEM. doc: Fix best_nb_channells typo matroska: pass the lace size to the matroska_parse_rm_audio Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>