summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* avformat/utils: Keep internal and external av_read_frame() packets in sync.Dale Curtis2013-05-231-0/+3
| | | | | | | | | | | Otherwise, during error conditions, the caller will be left with dangling pointers to a destructed packet => boom. BUG=242786 TEST=ffmpeg_regression_tests Commit slightly simplified by commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Support playing SMV files.Ash Hughes2013-05-221-5/+29
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avienc: Disallow the first frame to be skipedMichael Niedermayer2013-05-221-1/+1
| | | | | | Fixes Ticket2386 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* seek-test: make duration user configurableMichael Niedermayer2013-05-211-1/+4
| | | | | | Previously this was hardcoded to 4 seconds Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/matroskadec: fix integer overflowMichael Niedermayer2013-05-191-1/+1
| | | | | | Fixes fate-mkv with ekopath 4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ftp: favor strtoll over atollHendrik Leppkes2013-05-191-1/+1
| | | | | | | | | Both strtoll and atoll have different names on MSVC, and strtoll has a compatibility layer in place for this case. Fixes compilation on MSVC. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* FTP protocol supportLukasz Marek2013-05-183-0/+661
| | | | | | | | | Implementation of ftp protocol. Fixes #1672 Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* movenc: add video_track_timescale optionJean First2013-05-182-3/+9
| | | | | Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mov: set block_align for MACE 3:1 and MACE 6:1Piotr Bandurski2013-05-181-0/+2
| | | | | | fixes remuxing of audio track from mov to aifc Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avidec: dont randomly skip packets for offseting the indexMichael Niedermayer2013-05-171-2/+2
| | | | | | Fixes Ticket2490 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* id3v2enc: chapter supportPaul B Mahol2013-05-171-13/+69
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* libmodplug: fix sz typePaul B Mahol2013-05-171-2/+2
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Adding support for encoding VP8 AlphaVignesh Venkatasubramanian2013-05-171-0/+1
| | | | | | | | | | This patch adds support for encoding VP8 files with alpha. The alpha channel is encoded separately and the output is placed in AVPacket's side_data. The muxer then muxes it into the BlockAdditional element of the matroska container. More details on spec here: http://goo.gl/wCP1y Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vformat/matroskaenc: factorize alpha code in mkv_write_block()Michael Niedermayer2013-05-171-19/+14
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Adding support for muxing VP8 Alpha filesVignesh Venkatasubramanian2013-05-171-10/+49
| | | | | | | | | This patch adds support for muxing VP8 Alpha Files. The Alpha channel data is placed in BlockAdditional element of the matroska container. More information & exact spec on how this is implemented can be found here: http://goo.gl/wCP1y Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9'Michael Niedermayer2013-05-171-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9': Apple Intermediate Codec decoder movenc: Don't add base_data_offset in tfhd for PIFF files Conflicts: Changelog libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Apple Intermediate Codec decoderKostya Shishkov2013-05-171-0/+2
| |
| * movenc: Don't add base_data_offset in tfhd for PIFF filesJeremy Hinegardner2013-05-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | According to the PIFF specification[1] the base_data_offset field MUST be omitteed. See section 5.2.17. Since the ISMV files created by libavformat state that they are 'piff' compatible via 'ftyp' box, this needs to be corrected. [1] http://www.iis.net/learn/media/smooth-streaming/protected-interoperable-file-format Signed-off-by: Martin Storsjö <martin@martin.st>
* | Turn off usage of base_data_offset in tfhd for PIFF filesJeremy Hinegardner2013-05-171-2/+4
| | | | | | | | | | | | | | | | | | | | According to the PIFF specification[1] the base_data_offset field MUST be omitteed. See section 5.2.17. Since the ISMV files created by ffmpeg state that they are 'piff' compatible via 'ftyp' box, this needs to be corrected. [1] http://www.iis.net/learn/media/smooth-streaming/protected-interoperable-file-format Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/img2enc: use FF_CEIL_RSHIFT().Clément Bœsch2013-05-161-1/+1
| |
* | Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'Michael Niedermayer2013-05-1611-21/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110': vf_aspect: use the name 's' for the pointer to the private context Remove commented-out debug #define cruft Conflicts: libavcodec/4xm.c libavcodec/dvdsubdec.c libavcodec/ituh263dec.c libavcodec/mpeg12.c libavfilter/avfilter.c libavfilter/vf_aspect.c libavfilter/vf_fieldorder.c libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove commented-out debug #define cruftDiego Biurrun2013-05-1611-21/+0
| |
* | Merge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d'Michael Niedermayer2013-05-161-3/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d': Remove commented-out #includes h263dec: Remove broken and disabled debug cruft vc1: Reindent INIT_LUT(), align backslashes Conflicts: libavcodec/vc1.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove commented-out #includesDiego Biurrun2013-05-151-3/+0
| |
* | lavf/concat: reject empty scripts.Nicolas George2013-05-151-0/+2
| | | | | | | | Fix trac ticket #2566.
* | wv: make probing more robustPaul B Mahol2013-05-151-2/+5
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-05-151-1/+1
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Reduce probing score for flic animation files. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Reduce probing score for flic animation files.Carl Eugen Hoyos2013-05-151-1/+1
| | | | | | | | | | | | Fixes ticket #2567.
* | | replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*Michael Niedermayer2013-05-151-1/+1
|/ / | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01'Michael Niedermayer2013-05-151-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01': fate: update the mmf reference mmf: Write metadata into an Optional Data chunk jpeg2000dec: Use correct printf length modifier for pointer differences Conflicts: libavformat/mmf.c tests/ref/lavf/mmf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mmf: Write metadata into an Optional Data chunkYoshihisa Uchida2013-05-141-1/+4
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/srtdec: Fix pointer corruptionMichael Niedermayer2013-05-141-2/+4
| | | | | | | | | | | | | | This fixes use of uninitialized memory and possible out of array access Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | md5enc: don't reuse priv_class in two formatsHendrik Leppkes2013-05-131-3/+10
| | | | | | | | | | | | Apparently, this is not allowed and can trip up all sorts of things. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add a generic hash API.Reimar Döffinger2013-05-131-18/+43
| | | | | | | | | | | | Also use this API in framemd5. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Better handling for MXF essence reading reaching EOF.Joseph Artsimovich2013-05-131-4/+2
| | | | | | | | | | | | | | | | If no metadata follows MXF essence, that is essence ends with EOF, "Operation not permitted" error was produced and a non-zero code was returned from ffmpeg executable. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not read strd chunk in avi files as H264 extradata.Carl Eugen Hoyos2013-05-131-1/+3
| | | | | | | | Fixes ticket #2561.
* | redspark: fix memleak in redspark_read_headerPaul B Mahol2013-05-121-10/+20
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ADPCM IMA Radical decoderJames Almer2013-05-101-2/+11
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | RedSpark demuxerJames Almer2013-05-104-1/+160
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | RSD demuxerJames Almer2013-05-104-1/+164
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | ADP demuxerJames Almer2013-05-104-2/+95
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avidec: Enable full parsing for potencoder mpeg1/2Michael Niedermayer2013-05-101-0/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-101-36/+42
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: mmf: K&R formatting cosmetics Conflicts: libavformat/mmf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mmf: K&R formatting cosmeticsLuca Barbato2013-05-091-39/+45
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'db9aee6ccf183508835acc325f5ad87d595eacc4'Michael Niedermayer2013-05-081-2/+4
|\ \ | |/ | | | | | | | | | | * commit 'db9aee6ccf183508835acc325f5ad87d595eacc4': oma: properly forward errors in oma_read_packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oma: properly forward errors in oma_read_packetLuca Barbato2013-05-071-2/+4
| | | | | | | | | | | | Prevent spurios EIO on EOF. CC:libav-stable@libav.org
* | Merge commit '6f98508e2b86dcb79614d8c9b8e97c5e83a21cb0'Michael Niedermayer2013-05-081-6/+6
|\ \ | |/ | | | | | | | | | | * commit '6f98508e2b86dcb79614d8c9b8e97c5e83a21cb0': oma: return meaningful errors Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oma: return meaningful errorsLuca Barbato2013-05-071-6/+6
| |
* | Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe'Michael Niedermayer2013-05-081-10/+16
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe': nut: use meaningful error values FATE: use a less ambiguous end time for filter-trim-time test Conflicts: libavformat/nutdec.c tests/fate/filter-video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: use meaningful error valuesLuca Barbato2013-05-071-11/+17
| | | | | | | | Fix the mispresented EINVAL for EOF on partial files, among the other.
View Lorry Controller Status