summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avformat/dss: implement seekingMichael Niedermayer2015-02-26
| | | | | | | This assumes CBR (which is true for all samples i have) Previous version reviewed by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/dss: set bitrateMichael Niedermayer2015-02-26
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/dss: set packet durationMichael Niedermayer2015-02-26
| | | | | | Value taken from the decoder implementation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/dss: correct sample rateMichael Niedermayer2015-02-26
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavutil: add x86 optimized av_popcountJames Almer2015-02-25
| | | | | Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/hevc_ps: Check that log2_ctb_size is not smaller than the bounds of ↵Michael Niedermayer2015-02-25
| | | | | | | | | | | all profiles Fixes: unaligned memory access Fixes: signal_sigsegv_3344165_576_cov_3406448105_DBLK_A_MAIN10_VIXS_2.bit Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Suggested-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/snow: Initialize spatial_decomposition_count to a valid valueMichael Niedermayer2015-02-25
| | | | | | | | Fixes undefined behavior Fixes: signal_sigsegv_24169e6_3445_cov_3778346427_snow_chroma_bug.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/common: Fix integer overflow in av_clip_int8/16_cMichael Niedermayer2015-02-25
| | | | | | | Fixes: signal_sigsegv_30420a5_2388_cov_1489993561_integra_lavf.mp4 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/hevcdsp: ARM NEON optimized qpel functionsSeppo Tomperi2015-02-25
| | | | | | uses comma as macro parameter separator Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2015-02-25
|\ | | | | | | | | | | | | | | * cehoyos/master: Allow muxing h264 into ts with startcode "001" instead of "0001". lavfi/fade: Do not overread input buffer. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Allow muxing h264 into ts with startcode "001" instead of "0001".Carl Eugen Hoyos2015-02-25
| | | | | | | | | | Fixes ticket #2220. Fixes ticket #4324.
| * lavfi/fade: Do not overread input buffer.Carl Eugen Hoyos2015-02-25
| |
* | avcodec/hevc_ps: Sanity checks for some log2_* valuesMichael Niedermayer2015-02-25
| | | | | | | | | | | | log2 values which imply numeric overflow are not supported Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/palettegen: move longest variable to a local scopeClément Bœsch2015-02-25
|/ | | | | Also drop initialization since it is initialized later on before any usage.
* avformat/mov: Check ctts_count before useMichael Niedermayer2015-02-25
| | | | | | | | Fixes out of array read Fixes: asan_heap-oob_ae74b5_3610_cov_1739568095_test.3g2 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/zmbv: Check len before reading in decode_frame()Michael Niedermayer2015-02-25
| | | | | | | | Fixes out of array read Fixes: asan_heap-oob_4d4eb0_3994_cov_3169972261_zmbv_15bit.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/h264: Clear last_pic_for_ec on seeks and reinitsMichael Niedermayer2015-02-25
| | | | | | | | Fixes out of array read Fixes: asan_heap-oob_2ff30d2_3479_cov_3803648058_src13_hrc7_525_420_2.264 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/arm/hevcdsp_idct_neon: drop ".code 32"Michael Niedermayer2015-02-25
| | | | | | | gas-preprocessor and armasm fail otherwise Tested-by: Timotius Margo Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b'Michael Niedermayer2015-02-25
|\ | | | | | | | | | | | | | | | | | | | | * commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b': xcbgrab: Unbreak parsing filename options Conflicts: libavdevice/xcbgrab.c See: db442c873631065e8719df6da91c016d25501084 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xcbgrab: Unbreak parsing filename optionsLuca Barbato2015-02-24
| | | | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'b31328d008985f87f0a7c83c700847cef1a4f08c'Michael Niedermayer2015-02-25
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b31328d008985f87f0a7c83c700847cef1a4f08c': xcbgrab: Provide better names for the y and x option Conflicts: doc/indevs.texi libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xcbgrab: Provide better names for the y and x optionLuca Barbato2015-02-24
| | | | | | | | | | | | | | | | | | | | Incidentally `-y` also collides with avconv global options. Update x11grab to match and document the option. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'da7e561964ee833678dc24fae0b0265358126d1e'Michael Niedermayer2015-02-25
|\| | | | | | | | | | | | | | | * commit 'da7e561964ee833678dc24fae0b0265358126d1e': matroskaenc: Allow writing track "forced" flag See: d88d0b6db6bd77269e3c2d3b4894c072f3860671 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: Allow writing track "forced" flagJohn Stebbins2015-02-24
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'Michael Niedermayer2015-02-25
|\| | | | | | | | | | | | | * commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd': rtpdec: Rename the free method to close Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Rename the free method to closeMartin Storsjö2015-02-24
| | | | | | | | | | | | | | | | | | Many of these functions were named foo_free_context, and since the functions no longer should free the context itself, only allocated elements within it, the previous naming was slightly misleading. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a'Michael Niedermayer2015-02-25
|\| | | | | | | | | | | | | * commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a': libavformat: Use ffio_free_dyn_buf where applicable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavformat: Use ffio_free_dyn_buf where applicableMartin Storsjö2015-02-24
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '199fb40278146c5bb162990c66ad3cd561abc780'Michael Niedermayer2015-02-25
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '199fb40278146c5bb162990c66ad3cd561abc780': rtpdec: Use ffio_free_dyn_buf Conflicts: libavformat/rtpdec_latm.c libavformat/rtpdec_svq3.c libavformat/rtpdec_xiph.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Use ffio_free_dyn_bufMartin Storsjö2015-02-24
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8a273a746061a112e5e35066a8fd8e146d821a62'Michael Niedermayer2015-02-25
|\| | | | | | | | | | | | | * commit '8a273a746061a112e5e35066a8fd8e146d821a62': avio: Add an internal utility function for freeing dynamic buffers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: Add an internal utility function for freeing dynamic buffersMartin Storsjö2015-02-24
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '078d43e23a7a3d64aafee8a58b380d3e139b3020'Michael Niedermayer2015-02-25
|\| | | | | | | | | | | | | * commit '078d43e23a7a3d64aafee8a58b380d3e139b3020': rtpdec: Free depacketizers if the init function failed Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Free depacketizers if the init function failedMartin Storsjö2015-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is different from how it is handled in codecs/demuxers/muxers though (where the close function isn't called if the open function failed), but since the number of depacketizers that have an .init function is quite limited, this is easy to change. The main point is that if the init function failed, we shouldn't try to use that depacketizer at all - this makes sure that the parse function doesn't need to check for the things that were initialized in the init function. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'bb4a310bb85f43e62240145a656b1e5285b14239'Michael Niedermayer2015-02-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bb4a310bb85f43e62240145a656b1e5285b14239': rtpdec: Don't free the payload context in the .free function Conflicts: libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_mpegts.c libavformat/rtpdec_xiph.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Don't free the payload context in the .free functionMartin Storsjö2015-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it more consistent with depacketizers that don't have any .free function at all, where the payload context is freed by the surrounding framework. Always free the context in the surrounding framework, having the individual depacketizers only free any data they've specifically allocated themselves. This is similar to how this works for demuxer/muxers/codecs - a component shouldn't free the priv_data that the framework has allocated for it. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f4b59334bd898c47c9ac30999a346176548630a8'Michael Niedermayer2015-02-25
|\| | | | | | | | | | | | | * commit 'f4b59334bd898c47c9ac30999a346176548630a8': rtpdec: Remove the now unused .alloc field Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Remove the now unused .alloc fieldMartin Storsjö2015-02-24
| | | | | | | | | | | | Always use the .priv_data_size field instead. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/rtpdec_vp9: remove alloc/free functionsMichael Niedermayer2015-02-25
| | | | | | | | | | | | Simplify code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '78791c086bcaf9eb084c27555b31fea8bbb7624a'Michael Niedermayer2015-02-25
|\| | | | | | | | | | | | | | | | | | | * commit '78791c086bcaf9eb084c27555b31fea8bbb7624a': rtpdec: Use .init instead of .alloc to set default values Conflicts: libavformat/rdt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Use .init instead of .alloc to set default valuesMartin Storsjö2015-02-24
| | | | | | | | | | | | The ugly error handling in rdt gets improved in a later commit. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '88434f9725e7c9484dcbcf323566ae88a2904f32'Michael Niedermayer2015-02-24
|\| | | | | | | | | | | | | * commit '88434f9725e7c9484dcbcf323566ae88a2904f32': rtpdec: Remove unnecessary inline attributes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Remove unnecessary inline attributesMartin Storsjö2015-02-24
| | | | | | | | | | | | | | These functions are far from performance critical, so there's no point in marking them as inline. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74'Michael Niedermayer2015-02-24
|\| | | | | | | | | | | | | * commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74': rtpdec: Don't pass non-const pointers to fmtp attribute parsing functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Don't pass non-const pointers to fmtp attribute parsing functionsMartin Storsjö2015-02-24
| | | | | | | | | | | | | | This makes it clear that the individual parsing functions can't touch the parsed out value. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ac0e54fda9305cc7d149007f5b512bb8619f7c78'Michael Niedermayer2015-02-24
|\| | | | | | | | | | | | | * commit 'ac0e54fda9305cc7d149007f5b512bb8619f7c78': rtpdec: Add const to string parameters in internal fmtp parsing functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Add const to string parameters in internal fmtp parsing functionsMartin Storsjö2015-02-24
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '12251f997bbc0abb93be39c51021e6d404ca385f'Michael Niedermayer2015-02-24
|\| | | | | | | | | | | | | * commit '12251f997bbc0abb93be39c51021e6d404ca385f': rtpdec: Remove unnecessary checks Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Remove unnecessary checksMartin Storsjö2015-02-24
| | | | | | | | | | | | The free function of a depacketizer won't be called if data is NULL. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb'Michael Niedermayer2015-02-24
|\| | | | | | | | | | | | | | | | | | | * commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb': rtpenc: Merge the h264 and hevc packetizers Conflicts: libavformat/rtpenc_hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>