summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* lavc/hevcdsp: Fix compilation for arm with --disable-neon.Carl Eugen Hoyos2015-03-10
|
* lavd/avfoundation: Silence warnings when compiling for iOS.Carl Eugen Hoyos2015-03-10
| | | | Reviewed-by: Thilo Borgmann
* lavd/avfoundation: Silence c99 warnings when using gcc.Carl Eugen Hoyos2015-03-10
| | | | Reviewed-by: Thilo Borgmann
* lavd/qtkit: Silence deprecation warnings when using clang.Carl Eugen Hoyos2015-03-10
| | | | Reviewed-by: Thilo Borgmann
* Merge commit '448c8cfe4c53e9e806effd8505b46d57fa707061'Michael Niedermayer2015-03-10
|\ | | | | | | | | | | | | | | | | | | * commit '448c8cfe4c53e9e806effd8505b46d57fa707061': movenc: Support setting fragment_index before the moov atom is written Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Support setting fragment_index before the moov atom is writtenMartin Storsjö2015-03-10
| | | | | | | | | | | | | | | | | | | | This way, the caller doesn't need to coordinate setting the option after the moov atom has been written. The downside is that it is no longer possible to use the option for checking whether the moov atom already has been written, but a caller is able to keep track of that by other means anyway. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0c5e380c2c266d2e8a13c000cc527529db837f10'Michael Niedermayer2015-03-10
|\| | | | | | | | | | | | | * commit '0c5e380c2c266d2e8a13c000cc527529db837f10': movenc: Don't rely on the fragment index for vc1 info gathering Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Don't rely on the fragment index for vc1 info gatheringMartin Storsjö2015-03-10
| | | | | | | | | | | | | | | | The previous use of the mov->fragments field, for determining whether written packets were part of the first fragment or not, didn't work as intended when using the empty_moov flag. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'cf402d6fa88acd647cdff993429583bec8a34fdc'Michael Niedermayer2015-03-10
|\| | | | | | | | | | | | | | | * commit 'cf402d6fa88acd647cdff993429583bec8a34fdc': rtpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeeded Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeededMartin Storsjö2015-03-10
| | | | | | | | | | | | | | | | | | | | | | | | By making sure we at each time only have one pointer set, either a local variable or one in the context, we avoid potential double frees in the cleanup routines. If chain->rtp_ctx is set, it is closed by calling avformat_write_trailer, but that shouldn't be called unless avformat_write_header succeeded. This issue was pointed out by Andreas Cadhalpun. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c83dd2d2a458075a58895c384372f57c1ec26276'Michael Niedermayer2015-03-10
|\| | | | | | | | | | | | | | | * commit 'c83dd2d2a458075a58895c384372f57c1ec26276': rtpenc_mpegts: Free the right ->pb in the error path in the init function Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_mpegts: Free the right ->pb in the error path in the init functionMartin Storsjö2015-03-10
| | | | | | | | | | | | This fixes a typo from 8e32b1f096. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '96a06dbaf278e8152487e08772946f63bd2a3843'Michael Niedermayer2015-03-10
|\| | | | | | | | | | | | | | | | | | | | | * commit '96a06dbaf278e8152487e08772946f63bd2a3843': FATE: add support for testing hwaccels Conflicts: tests/Makefile tests/fate-run.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * FATE: add support for testing hwaccelsAnton Khirnov2015-03-10
| |
* | Merge commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56'Michael Niedermayer2015-03-10
|\| | | | | | | | | | | | | * commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56': avconv: do not abort immediately if initializing hwaccel fails Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: do not abort immediately if initializing hwaccel failsAnton Khirnov2015-03-10
| | | | | | | | | | | | exit_program() will try to free the decoders, which is not a good idea from within get_format(). Return an error instead.
* | avfilter/vf_fftfilt: increase RDFT length by 10%Michael Niedermayer2015-03-10
| | | | | | | | | | | | This fixes artifacts when the dimensions are exact powers of 2 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mxfenc: write package name metadataMark Reid2015-03-10
| | | | | | | | | | Previous-version-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfenc: fix leaking asf->index_ptr on errorAndreas Cadhalpun2015-03-09
| | | | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | roqvideoenc: set enc->avctx in roq_encode_initAndreas Cadhalpun2015-03-09
| | | | | | | | | | | | | | | | | | | | So far it is only set in roq_encode_frame, but it is used in roq_encode_end to free the coded_frame. This currently segfaults if roq_encode_frame is not called between roq_encode_init and roq_encode_end. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libvpxenc: Clear twopass_stats.sz on deallocationMichael Niedermayer2015-03-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '93f7948136fcda8ddbbc44a6c24418f11ca829b8'Michael Niedermayer2015-03-09
|\| | | | | | | | | | | | | * commit '93f7948136fcda8ddbbc44a6c24418f11ca829b8': libvpx: Fix mixed use of av_malloc() and av_reallocp() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libvpx: Fix mixed use of av_malloc() and av_reallocp()Vittorio Giovara2015-03-09
| | | | | | | | | | | | | | | | This buffer is resized when vpx_codec_get_cx_data() returns a VPX_CODEC_STATS_PKT packet. CC: libav-stable@libav.org Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/siff: Fix checks and variable typesMichael Niedermayer2015-03-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ad94c6ca0b86c463f476b26606259a2041dcddc9'Michael Niedermayer2015-03-09
|\| | | | | | | | | | | | | | | | | | | * commit 'ad94c6ca0b86c463f476b26606259a2041dcddc9': siff: Use the correct type for packet size variables Conflicts: libavformat/siff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * siff: Use the correct type for packet size variablesVittorio Giovara2015-03-09
| | | | | | | | | | | | | | | | The avio functions used here return an unsigned value. Also reduce a variable scope. CC: libav-stable@libav.org Bug-Id: CID 1258461
* | Merge commit '9f25a109922da43c1f81273a431d3b40cb5a785a'Michael Niedermayer2015-03-09
|\| | | | | | | | | | | | | * commit '9f25a109922da43c1f81273a431d3b40cb5a785a': matroskaenc: Also validate chapter end time Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: Also validate chapter end timeVittorio Giovara2015-03-09
| | | | | | | | | | | | | | This prevents it to be written as unsigned. Also add an error message. CC: libav-stable@libav.org Bug-Id: CID 1265717
* | Merge commit 'bfeb83a8b7d3fcf09a54d8dbc9c521e10bb17530'Michael Niedermayer2015-03-09
|\| | | | | | | | | | | | | * commit 'bfeb83a8b7d3fcf09a54d8dbc9c521e10bb17530': rtpdec_hevc: Drop extra sanity check for size of input packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_hevc: Drop extra sanity check for size of input packetVittorio Giovara2015-03-09
| | | | | | | | | | | | | | In this case len is always at least 3, since it is checked against RTP_HEVC_PAYLOAD_HEADER_SIZE + 1 before entering the switch block. Bug-Id: CID 1238784
* | avcodec/hevc_parser: use avpriv_find_start_code in hevc_split()zhaoxiu.zeng2015-03-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/options_table: remove extradata_size from the AVOptions tableMichael Niedermayer2015-03-09
| | | | | | | | | | | | | | | | | | | | allowing access to the size but not the extradata itself is not useful and could lead to potential problems if writing happens through this field Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tests/fate-run: Print more details on failure of stddev / filesize comparesClaudio Freire2015-03-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmdec: limit the backward seek to the last resync positionAndreas Cadhalpun2015-03-09
| | | | | | | | | | | | | | | | | | | | If resyncing leads to the same position as previously, it will again lead to a resync attempt, resulting in an infinite loop. Thus don't seek back beyond the last syncpoint. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add dependencies to configure file for vf_fftfiltArwa Arif2015-03-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmdec: make sure the time base is validAndreas Cadhalpun2015-03-09
| | | | | | | | | | | | | | A negative time base can trigger assertions. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '46d4d8575979a24a8d026d9805039b724e0e3e5f'Michael Niedermayer2015-03-09
|\| | | | | | | | | | | | | * commit '46d4d8575979a24a8d026d9805039b724e0e3e5f': movenc: Avoid writing separate flags for the first sample if not necessary Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Avoid writing separate flags for the first sample if not necessaryMartin Storsjö2015-03-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '00d751d4fc20ec88d2cc2c9f39ec8b9e9c8cdeba'Michael Niedermayer2015-03-09
|\| | | | | | | | | | | | | * commit '00d751d4fc20ec88d2cc2c9f39ec8b9e9c8cdeba': movenc: Set tfhd default sample flags based on actual samples, if possible Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Set tfhd default sample flags based on actual samples, if possibleMartin Storsjö2015-03-09
| | | | | | | | | | | | | | | | | | | | This avoids assuming that e.g. audio samples are marked as sync samples. This allows omitting the sample flags from trun, if the default flags happen to be right for all the samples. Signed-off-by: Martin Storsjö <martin@martin.st>
* | doc: Clarify documentation for fade duration.Carl Eugen Hoyos2015-03-09
| |
* | doc: Improve video creation examples (from image2).Carl Eugen Hoyos2015-03-09
| | | | | | | | | | The examples used to drop frames in most cases which was probably not what users expected.
* | Fix the intra_dc_precision API doc.Carl Eugen Hoyos2015-03-09
| | | | | | | | The mpegvideo decoder has set intra_dc_precision since forever.
* | lavc/ffv1enc: Auto-select -coder 1 for >8bit also for yuv.Carl Eugen Hoyos2015-03-09
| | | | | | | | Reported-by: Christoph Gerstbauer
* | ffmdec: fix infinite loop at EOFAndreas Cadhalpun2015-03-09
| | | | | | | | | | | | | | | | If EOF is reached, while skipping bytes, avio_tell(pb) won't change anymore, resulting in an infinite loop. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmdec: initialize f_cprv, f_stvi and f_stauAndreas Cadhalpun2015-03-09
| | | | | | | | | | | | | | | | They are used in a switch statement, but it is not guaranteed that the COMM case (where they are set to 0) is reached before the other cases. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d'Michael Niedermayer2015-03-09
|\| | | | | | | | | | | | | | | * commit '0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d': utvideodec: Handle slice_height being zero See: 3881606240953b9275a247a1c98a567f3c44890f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * utvideodec: Handle slice_height being zeroMichael Niedermayer2015-03-09
| | | | | | | | | | | | | | | | | | | | Fixes out of array accesses. CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Bug-Id: CVE-2014-9604 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'Michael Niedermayer2015-03-08
|\| | | | | | | | | | | | | | | | | | | * commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f': avprobe: Export coded_{width,height} in -show_streams Conflicts: avprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avprobe: Export coded_{width,height} in -show_streamsVittorio Giovara2015-03-08
| |