summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avutil/fifo: delay addition of const from ↵Michael Niedermayer2014-05-14
| | | | | | | | 78d3453c4a2efef9bc079e8f3458653beafcf990 until next major ABI bump This unbreaks API, for example audacity has more build errors due to this Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/version: add FF_CONST_AVUTIL53Michael Niedermayer2014-05-14
| | | | | | This will become "const" on the next major API version Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '7e90133f6420b1c53652f972b9561600822881ee'Michael Niedermayer2014-05-14
|\ | | | | | | | | | | | | | | | | | | | | * commit '7e90133f6420b1c53652f972b9561600822881ee': build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined Conflicts: common.mak See: efa95968317411179b0016af54745906029c2295 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not definedJanne Grunau2014-05-14
| | | | | | | | Avoids including disabled library Makefiles.
* | Merge commit 'a738540366c9b114949b7914c0d08e2c28982cfb'Michael Niedermayer2014-05-14
|\| | | | | | | | | | | | | * commit 'a738540366c9b114949b7914c0d08e2c28982cfb': lavf: properly document the distinction between flags and ctx_flags Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: properly document the distinction between flags and ctx_flagsAnton Khirnov2014-05-14
| |
* | avfilter/lut3d: move the scale calc out of the inner loop.Clément Bœsch2014-05-14
| |
* | avfilter/vf_removelogo: use av_malloc_array()Michael Niedermayer2014-05-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_hqdn3: use av_malloc_array()Michael Niedermayer2014-05-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libx264: Implement reference frame count limiting based on levelMichael Niedermayer2014-05-14
| | | | | | | | | | | | | | | | | | | | | | This makes libavcodec/libx264.c behave more similar to the x264 command line util Fixes Ticket3307 Implementation based on x264 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/utils: Add check that ensures that the hardcoded struct offsets are ↵Michael Niedermayer2014-05-14
| | | | | | | | | | | | valid Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | build: move ebur128 swr dep to configure.Clément Bœsch2014-05-13
| |
* | configure: swresample depends on avutilMichael Niedermayer2014-05-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | common.mak: fix (not)building disabled libsMichael Niedermayer2014-05-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'Michael Niedermayer2014-05-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '449511740f06a4675b0066730fa45cdb764ffafc': build: handle library dependencies in configure Conflicts: common.mak configure libavdevice/Makefile libavfilter/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: handle library dependencies in configureJanne Grunau2014-05-13
| | | | | | | | | | Instead of setting FFLIBS in each library Makefile configure exports FFLIBS-$library in config.mak.
* | dpx: use intfloat.h instead of deprecated intfloat_readwrite.h.Reimar Döffinger2014-05-13
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit '9aa4592076d4dbb29d1198b0e258f9f85c0c00b5'Michael Niedermayer2014-05-13
|\| | | | | | | | | | | | | * commit '9aa4592076d4dbb29d1198b0e258f9f85c0c00b5': aarch64: assembler in clang-3.4 ignores the division by two Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: assembler in clang-3.4 ignores the division by twoJanne Grunau2014-05-13
| | | | | | | | Values are positive powers of two, so just replace it with right shift.
* | Use rac_get_prob branchy version when used within a conditional branch.Matt Oliver2014-05-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support broadcast destination for udp protocolOlivier Langlois2014-05-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the required socket option SO_BROADCAST to be able to stream to a broadcast address. Prior to the patch, trying to stream to a broadcast address was resulting to the following error: av_interleaved_write_frame(): Permission denied The patch has been tested with: ffmpeg -f v4l2 -framerate 30 -input_format yuyv422 -video_size 640x480 -i /dev/video0 \ -c:v libx264 -profile:v high -preset ultrafast -tune zerolatency -b:v 500k -pix_fmt yuv420p \ -f mpegts udp://192.168.1.255:5004?broadcast=1 I have added an option to let the user explicitly request broadcast in order to avoid ffmpeg to broadcast unintentionally. Signed-off-by: Olivier Langlois <olivier@trillion01.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: fixing code indenting in hevcpred(cherry picked from commit ↵Mickaël Raulet2014-05-13
| | | | | | | | | | | | 28a5916845928de2951013b5398465573b181925) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc/intrapred: fix indent(cherry picked from commit ↵Mickaël Raulet2014-05-13
| | | | | | | | | | | | ab167f3158cf37bd679bda28566170e2c3691686) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: a much faster implementation of intra prediction (up to 1s onMickaël Raulet2014-05-13
| | | | | | | | | | | | haswell 2.6GHz on basket ball drive all intra qp 27)(cherry picked from commit 5de9739176f0eb4c205e80a91628a0196c9924b2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfenc: honor the maximum of 63 payloadsAaron Graham2014-05-13
| | | | | | | | | | | | Fixes Ticket3634 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: add option to make is_intra_more_likely() from error concealment ↵Michael Niedermayer2014-05-12
| | | | | | | | | | | | return "no" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mp3dec: check the number of frames per buffer sizeMichael Niedermayer2014-05-12
| | | | | | | | | | | | Fixes misdetection of issue3327-libc-2.17.so Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: if the id3 tag is too large for data after it to become ↵Michael Niedermayer2014-05-12
| | | | | | | | | | | | available, use the full AVPROBE_SCORE_EXTENSION if extension matches Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: limit probe score in the id3 case only if there is a chance ↵Michael Niedermayer2014-05-12
| | | | | | | | | | | | | | | | that data after the id3 tag will become available Fixes ticket3327 (sample.mp3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Use Matroska document version 2 for WebM files if possible.Carl Eugen Hoyos2014-05-12
| | | | | | | | | | | | | | Google's plugin for the Internet Explorer refuses to play files with another document version. Fixes ticket #3583.
* | Fix compilation with --enable-lto --enable-shared with icc.Carl Eugen Hoyos2014-05-12
| |
* | hevcdsp: correctly indicate that hevc_put_hevc_bi_epel_h uses 9 GPRsHendrik Leppkes2014-05-12
| | | | | | | | | | | | | | Fixes FATE on Windows. Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/buffer: Use av_malloc_array()Michael Niedermayer2014-05-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/buffersrc: use av_mallocz_array()Michael Niedermayer2014-05-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: Ensure log2 is disable based on msvcrt version.Matt Oliver2014-05-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: Allow log2 with msvc12 onwards.Matt Oliver2014-05-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vda_h264: fix bistream typoMichael Niedermayer2014-05-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'Michael Niedermayer2014-05-12
|\| | | | | | | | | | | | | | | | | | | * commit '1839fafa951308237c4672ffd9a94f927b26eac7': avconv: Support VDA hwaccel Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Support VDA hwaccelAnton Khirnov2014-05-11
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avcodec/vda_h264: fix null pointer dereferenceMichael Niedermayer2014-05-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '67afcefb35932b420998f6f3fda46c7c85848a3f'Michael Niedermayer2014-05-12
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '67afcefb35932b420998f6f3fda46c7c85848a3f': lavc: Add new VDA hwaccel Conflicts: configure libavcodec/vda.h libavcodec/vda_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Add new VDA hwaccelAnton Khirnov2014-05-11
| | | | | | | | | | | | | | | | | | It leverages the new hwaccel 1.2 features: - get_buffer2 is never called - the internal context is automatically initialized/deinitialized Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '31a46750c7eafe6bce6a3e4f09853cd0a585292b'Michael Niedermayer2014-05-12
|\| | | | | | | | | | | | | | | | | | | | | * commit '31a46750c7eafe6bce6a3e4f09853cd0a585292b': vda: use hwaccel private data for internal bitstream buffer Conflicts: libavcodec/vda.h libavcodec/vda_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vda: use hwaccel private data for internal bitstream bufferAnton Khirnov2014-05-11
| |
* | Merge commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f'Michael Niedermayer2014-05-12
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f': lavu: Add a pixel format for new VDA hwaccel Conflicts: doc/APIchanges libavutil/pixfmt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: Add a pixel format for new VDA hwaccelAnton Khirnov2014-05-11
| | | | | | | | | | The current hwaccel is broken and cannot be fixed in a compatible way. It will be deprecated and replaced with a new one.
* | Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'Michael Niedermayer2014-05-12
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8': lavc: Add hwaccel private data and init/uninit callbacks Conflicts: libavcodec/avcodec.h libavcodec/internal.h libavcodec/pthread_frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Add hwaccel private data and init/uninit callbacksAnton Khirnov2014-05-11
| |
* | Merge commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436'Michael Niedermayer2014-05-12
|\| | | | | | | | | | | | | | | | | | | * commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436': hwaccel: Support specific frame allocators Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hwaccel: Support specific frame allocatorsLuca Barbato2014-05-11
| | | | | | | | It would reduce the boilerplate code users have to write.