summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avcodec/ac3enc: Use avpriv_float_dsp_alloc()Michael Niedermayer2014-11-29
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/ppc/util_altivec: add () to VEC_SPLAT16 macroMichael Niedermayer2014-11-29
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/buffer: Move USE_ATOMICS to thread.h to avoid it becoming out of sync ↵Michael Niedermayer2014-11-29
| | | | | | with it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavutil/threads.h: correct an include to be localDave Yeo2014-11-29
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavutil/thread.h: Support OS/2 threadsDave Yeo2014-11-29
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/bprint: C++ compatible AVBPrint definition.Vadim Kalinsky2014-11-29
| | | | | Previous version reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavu/opt: add escaping to av_opt_serializeLukasz Marek2014-11-29
| | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* avfilter/vf_idet: Fixing idet for single-frame inputs.Neil Birkbeck2014-11-28
| | | | | | | | | | | | | | | | | | | | Handle single frame inputs similar to yadif (e.g., https://github.com/FFmpeg/FFmpeg/commit/0f9f24c9cfd291c7ece4d3bad64fdf06d107168a and https://github.com/FFmpeg/FFmpeg/commit/681e008d06d2241d50abe6316c908a184ddc5942) Example: ffmpeg -r 1 -t 1 -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm -vf idet,showinfo -f null -y /dev/null Previously: Output file is empty, nothing was encoded (check -ss / -t / -frames parameters if used) [Parsed_idet_0 @ 0x36389d0] Repeated Fields: Neither: 0 Top: 0 Bottom: 0 After patch: [Parsed_showinfo_1 @ 0x1909810] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 ... [Parsed_idet_0 @ 0x18f9bb0] Repeated Fields: Neither: 1 Top: 0 Bottom: 0 Fate looks good. Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '491805636cef50d3f582bd345e1460eeb739ea48'Michael Niedermayer2014-11-28
|\ | | | | | | | | | | | | * commit '491805636cef50d3f582bd345e1460eeb739ea48': rtmpproto: Fix a typo in a comment Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Fix a typo in a commentMartin Storsjö2014-11-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | fix Makefile objects for pulseaudio supportMichael Stypa2014-11-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pngdec: apng: fix output buffer filling when no blending is needed.Benoit Fouet2014-11-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ppc/h264qpel_template: protect unistd.h by #if HAVE_UNISTD_HMichael Niedermayer2014-11-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pngdec: allow for some code path optimizations.Benoit Fouet2014-11-28
| | | | | | | | | | | | | | Use 'if (CONFIG_APNG_DECODER)' where needed, so that the compiler can optimize out some portion of code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pngdec: do not blend on transparent blackBenoit Fouet2014-11-28
| | | | | | | | | | | | | | | | There is no need to memset the zlib output buffer, as there is no blending happening there. Instead, do not blend when the dispose operation is set to 'background' (tranparent black). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ppc/h264qpel: POWER LE support for put_pixels16_l2_altivec() and ↵Rong Yan2014-11-28
| | | | | | | | | | | | | | | | avg_pixels16_l2_altivec() add put_unligned_store() and avg_unligned_store() macros Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ppc/h264qpel_template: POWER LE support for ↵Rong Yan2014-11-28
| | | | | | | | | | | | | | | | PREFIX_h264_qpel16_h_lowpass_altivec() PREFIX_h264_qpel16_v_lowpass_altivec() PREFIX_h264_qpel16_hv_lowpass_altivec() add load_alignment() macro Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ppc/h264chroma_template: POWER LE support for ↵Rong Yan2014-11-28
| | | | | | | | | | | | | | | | PREFIX_h264_chroma_mc8_altivec() PREFIX_no_rnd_vc1_chroma_mc8_altivec() CHROMA_MC8_ALTIVEC_CORE_SIMPLE() CHROMA_MC8_ALTIVEC_CORE() add marcos GET_VSRC1() GET_VSRC() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ppc/h264dsp: POWER LE support for h264_idct8_add_altivec() ↵Rong Yan2014-11-28
| | | | | | | | | | | | | | | | h264_idct_dc_add_internal() h264_loop_filter_luma_altivec() write16x4() VEC_1D_DCT() weight_h264_W_altivec() biweight_h264_W_altivec() VEC_LOAD_U8_ADD_S16_STORE_U8() ALTIVEC_STORE_SUM_CLIP() add marcos GET_2PERM() dstv_load() vdst_load() dest_unligned_store() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fcae9f212a6001d966c52dc22cd4b22e9851b428'Michael Niedermayer2014-11-28
|\| | | | | | | | | | | | | * commit 'fcae9f212a6001d966c52dc22cd4b22e9851b428': dashenc: Avoid a VLA-like construct Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dashenc: Avoid a VLA-like constructMartin Storsjö2014-11-28
| | | | | | | | | | | | | | This fixes the build on compilers that interpreted the earlier code as a variable length array (which we intentionally disallow). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427'Michael Niedermayer2014-11-28
|\| | | | | | | | | | | | | | | | | | | * commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427': dashenc: Add options to make segment names configurable Conflicts: libavformat/dashenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dashenc: Add options to make segment names configurableBryan Huh2014-11-28
| | | | | | | | | | | | | | This allows one to specify templated segment names for init-segments, media-segments, and for the base-url in the case of single-file. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '01eac895ab350027467ffbe7278740f89ae8be75'Michael Niedermayer2014-11-28
|\| | | | | | | | | | | | | | | | | | | | | * commit '01eac895ab350027467ffbe7278740f89ae8be75': rtmpproto: Only prepend @setDataFrame for onMetaData and |RtmpSampleAccess Conflicts: libavformat/rtmpproto.c See: 60fd790f381cd404ffdafa8a86a6dc93c9d80f99 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Only prepend @setDataFrame for onMetaData and |RtmpSampleAccessMartin Storsjö2014-11-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when streaming to an RTMP server, any time a packet of type RTMP_PT_NOTIFY is encountered, the packet is prepended with @setDataFrame before it gets sent to the server. This is incorrect; only packets for onMetaData and |RtmpSampleAccess should invoke @setDataFrame on the RTMP server. Specifically, the current bug manifests itself when trying to stream onTextData or onCuePoint invocations. This fix addresses that problem and ensures that the @setDataFrame is only prepended for onMetaData and |RtmpSampleAccess. Since data is fed to the rtmp_write function in smaller pieces (depending on the calling IO buffer size), we can't generally assume that the whole packet (or even the whole command string) is available at once, therefore we can only check the command string once the full packet has been transferred to us for sending. Based on a patch by Jeffrey Wescott. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '44127b157e9f8acb837d4bb3a094f56b40da3ef5'Michael Niedermayer2014-11-28
|\| | | | | | | | | | | | | * commit '44127b157e9f8acb837d4bb3a094f56b40da3ef5': rtmppkt: Make pkt->data reallocable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmppkt: Make pkt->data reallocableMartin Storsjö2014-11-28
| | | | | | | | | | | | | | | | We try to avoid mixing av_malloc with av_realloc, since av_malloc may be implemented with functions that can't (formally) be mixed with the functions used in av_realloc. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352'Michael Niedermayer2014-11-28
|\| | | | | | | | | | | | | | | | | | | * commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352': rtmpproto: Simplify code for copying data into the output packet Conflicts: libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Simplify code for copying data into the output packetMartin Storsjö2014-11-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '857e6667f9061ae261c0b951113e4efc4329b05e'Michael Niedermayer2014-11-28
|\| | | | | | | | | | | | | | | | | | | * commit '857e6667f9061ae261c0b951113e4efc4329b05e': rtmpproto: Clarify a comment Conflicts: libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Clarify a commentMartin Storsjö2014-11-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/hevc_ps: Check num_long_term_ref_pics_spsMichael Niedermayer2014-11-28
| | | | | | | | | | | | | | Fixes out of array access Fixes: signal_sigsegv_35bd0f0_1182_cov_791726764_STRUCT_B_Samsung_4.bit Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pngdec: add support for 'over' blend operation for 'none' dispose ↵Benoit Fouet2014-11-28
| | | | | | | | | | | | operation. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pngdec: split P frames handling to a separate function.Benoit Fouet2014-11-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Move extralibs variables using ldl after ldl definitionTimo Rothenpieler2014-11-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1973079417e8701b52ba810a72cb6c7c6f7f9a56'Michael Niedermayer2014-11-28
|\| | | | | | | | | | | | | * commit '1973079417e8701b52ba810a72cb6c7c6f7f9a56': opusdec: make sure all substreams have the same number of coded samples Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * opusdec: make sure all substreams have the same number of coded samplesAnton Khirnov2014-11-27
| | | | | | | | | | | | Fixes invalid writes with invalid multichannel streams. CC:libav-stable@libav.org
* | Merge commit '96fda42a8f9bf84beaaf7f5991d17f2a057de86c'Michael Niedermayer2014-11-27
|\| | | | | | | | | | | | | | | * commit '96fda42a8f9bf84beaaf7f5991d17f2a057de86c': vf_interlace: get rid of useless loads See: ca59b5b6eceb1adbf96b8248128e58bfbb79c9a6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_interlace: get rid of useless loadsKieran Kunhya2014-11-27
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'fbd6c97f9ca858140df16dd07200ea0d4bdc1a83'Michael Niedermayer2014-11-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fbd6c97f9ca858140df16dd07200ea0d4bdc1a83': lavu: fix memory leaks by using a mutex instead of atomics Conflicts: libavutil/buffer.c The atomics code is left in place as a fallback for synchronization in the absence of p/w32 threads. Our ABI did not requires applications to only use threads (and matching ones) to what libavutil was build with Our code also was not affected by the leak this change fixes, though no question the atomics based implementation is not pretty at all. First and foremost the code must work, being pretty comes after that. If this causes problems, for example when libavutil is used by multiple applications each using a different kind of threading system then the default possibly has to be changed to the uglier atomics. See: cea3a63ba3d89d8403eef008f7a7c54d645cff70 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: fix memory leaks by using a mutex instead of atomicswm42014-11-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The buffer pool has to atomically add and remove entries from the linked list of available buffers. This was done by removing the entire list with a CAS operation, working on it, and then setting it back again (using a retry-loop in case another thread was doing the same thing). This could effectively cause memory leaks: while a thread was working on the buffer list, other threads would allocate new buffers, increasing the pool's total size. There was no real leak, but since these extra buffers were not needed, but not free'd either (except when the buffer pool was destroyed), this had the same effects as a real leak. For some reason, growth was exponential, and could easily kill the process due to OOM in real-world uses. Fix this by using a mutex to protect the list operations. The fancy way atomics remove the whole list to work on it is not needed anymore, which also avoids the situation which was causing the leak. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | lavu/opt: add consts where possibleLukasz Marek2014-11-27
| |
* | ffmpeg_opt: make use of recommended encoder configurationLukasz Marek2014-11-27
| | | | | | | | | | | | | | | | | | So far ffmpeg used recommended configuration only for codec priv options. ffmpeg will use now codec defaults and then apply recommended configuration for all options. Recommended configuration possibly contains minimal set of options to filful user configuration. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavf/ffmenc: store recommended encoder configurationLukasz Marek2014-11-27
| | | | | | | | | | | | | | | | | | | | | | ffmenc will store recommended encoder configuration if present. This will allow the user to base on local defaults and apply only explicitly set options. If recommended encoder configuration is not present, then non-default context's options are stored. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavf/ffmdec: add common options to recommended encoder configurationLukasz Marek2014-11-27
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | Merge commit '2443e522f0059176ff8717c9c753eb6fe7e7bbf1'Michael Niedermayer2014-11-27
|\| | | | | | | | | | | | | * commit '2443e522f0059176ff8717c9c753eb6fe7e7bbf1': lavu: add wrappers for the pthreads mutex API Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: add wrappers for the pthreads mutex APIAnton Khirnov2014-11-27
| | | | | | | | | | | | | | | | | | | | Also add no-op fallbacks when threading is disabled. This helps keeping the code clean if Libav is compiled for targets without threading. Since we assume that no threads of any kind are used in such configurations, doing nothing is ok by definition. Based on a patch by wm4 <nfxjfg@googlemail.com>.
* | avformat/rtpproto: Allow to specify DSCP classVincent Bernat2014-11-27
| | | | | | | | | | | | | | | | | | By appending `?dscp=26` to the URL, IP packets will be classified as AF31 (assured forwarding for multimedia flows with low probability of loss). On congested network, this allows a user to assign priorities to flows. Signed-off-by: Vincent Bernat <vincent@bernat.im>
* | avformat/udp: Allow to specify DSCP classVincent Bernat2014-11-27
| | | | | | | | | | | | | | | | | | By appending `?dscp=26` to the URL, IP packets will be classified as AF31 (assured forwarding for multimedia flows with low probability of loss). On congested network, this allows a user to assign priorities to flows. Signed-off-by: Vincent Bernat <vincent@bernat.im>
* | avcodec/mjpegdec: Fix integer overflow in shiftMichael Niedermayer2014-11-27
| | | | | | | | | | | | Fixes: signal_sigabrt_7ffff6ac7bb9_2683_cov_4120310995_m_ijpg.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>