summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | avcodec/mpegvideo_enc: Consider chroma_intra_matrix in dct_quantize_trellis_c()Michael Niedermayer2015-02-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: mjpeg trellis testMichael Niedermayer2015-02-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegenc: support trellis quantizationMichael Niedermayer2015-02-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo_enc: Add intra_chroma_ac_vlc_length, it will be needed for ↵Michael Niedermayer2015-02-11
| | | | | | | | | | | | mjpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: fix success pathJean Delvare2015-02-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 934f2d2f5c16df8aad9f401a9fd842b5d9a78b11, cmdutils_read_file() prints a confusing message on success: IO error: Success This is because the error message is printed on the success path as well. Add the missing condition so that it is only printed on error. Signed-off-by: Jean Delvare <jdelvare@suse.de> Cc: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: add dcshift filterPaul B Mahol2015-02-11
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/unsharp: OpenCL unsharpen filter optimization: substitute N^2 ↵Alexey Titov2015-02-11
| | | | | | | | | | | | | | | | filter computation with 2N+C i7-4770K luma 21% faster, chroma 18% faster A10-7850K luma 42% faster, chroma 37% faster on 1920x1080 res Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/isom: add X-Com Radvision fourccPaul B Mahol2015-02-11
| | | | | | | | | | | | Fixes bug #4303. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Changelog: mention more ported filtersPaul B Mahol2015-02-11
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffmpeg: Print negative times like "-00:05:01.22" instead of "00:-5:-1.-22"Michael Niedermayer2015-02-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Skip blocks which are outside the visible areaMichael Niedermayer2015-02-11
| | | | | | | | | | | | | | | | Fixes out of array accesses Fixes: ffmpeg_mjpeg_crash.avi Found-by: Thomas Lindroth <thomas.lindroth@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'Michael Niedermayer2015-02-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '9deaec782810d098bca11c9332fab2d2f4c5fb78': lavf: move internal fields from public to internal context Conflicts: libavformat/avformat.h libavformat/internal.h libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: move internal fields from public to internal contextwm42015-02-10
| | | | | | | | | | | | | | This is not an API change; the fields were explicitly declared private before. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '1509c018bd5b054a2354e20021ccbac9c934d213'Michael Niedermayer2015-02-11
|\| | | | | | | | | | | | | | | | | | | * commit '1509c018bd5b054a2354e20021ccbac9c934d213': mpegts: relax restrictions on matching the packet start in read_header Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: relax restrictions on matching the packet start in read_headerAnton Khirnov2015-02-10
| | | | | | | | | | | | | | | | | | | | | | analyze() is currently called both when probing and from read_header(). It determines the packet start by looking for the sync byte, followed by unset Transport Error Indicator and valid adaptation_field_control. This makes sense to do when probing, but once we already know the format is MPEG-TS, it is counterproductive to be so strict -- e.g. in some files the TEI might be set and analyze() might get called with a smaller buffer than the one used for probing, resulting in a failure.
* | Merge commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c'Michael Niedermayer2015-02-11
|\| | | | | | | | | | | | | | | | | | | | | * commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c': lavf: remove unused code Conflicts: libavformat/seek.c libavformat/seek.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove unused codewm42015-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | Nothing uses it, and it provides no public API. Archeological finds: Commit 101036adb9 added the API. Commit a8dd8dc6e9 made mpegts.c use it. Commit af8aae3fa3 disabled it by default in mpegts.c. Commit ae2bb52cd2 removed all uses of this from mpegts.c. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '0232ba62a28527579e34d44700b48017cc727e5f'Michael Niedermayer2015-02-11
|\| | | | | | | | | | | | | * commit '0232ba62a28527579e34d44700b48017cc727e5f': frame: clarify buf documentation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * frame: clarify buf documentationAnton Khirnov2015-02-08
| | | | | | | | Mention explicitly that the array must be filled contiguously.
* | doc/ffmpeg: Document frame_drop_thresholdMichael Niedermayer2015-02-10
| |
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2015-02-10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * cus/stable: ffplay: factorize thread starting and stopping code into decoder ffplay: make eof part of videostate and signal it when opening a stream ffplay: update frame timer based on last updated clock time when toggling pause Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffplay: factorize thread starting and stopping code into decoderMarton Balint2015-02-10
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: make eof part of videostate and signal it when opening a streamMarton Balint2015-02-10
| | | | | | | | | | | | | | | | | | | | | Otherwise we may not flush a decoder when a new stream is opened during an already eof condition. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: update frame timer based on last updated clock time when toggling pauseMarton Balint2015-02-10
| | | | | | | | | | | | | | | | | | It is better than using simply video clock, because video clock may be NAN. Signed-off-by: Marton Balint <cus@passwd.hu>
* | | avutil/error: list most common error code in error_entries when strerror_r() ↵Michael Niedermayer2015-02-10
| | | | | | | | | | | | | | | | | | | | | | | | is unavailable Fixes Ticket4267 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | tests: drop bc dependencyClément Bœsch2015-02-10
|/ / | | | | | | | | We already have a dependency on awk and bc is sometimes not found in the base system.
* | avfilter: Add repeatfields filter (Port of mp=softpulldown)Paul B Mahol2015-02-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavutil: camellia: remove unwanted memory loadsSupraja Meedinti2015-02-10
| | | | | | | | | | | | lavu CAMELLIA size: 1048576 runs: 1024 time: 21.549 +- 0.17 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat: DNxHD in .mov, switch unspecified color_range to mpegKevin Wheatley2015-02-10
| | | | | | | | | | | | | | | | | | | | Avid prefers mpeg range [16-235] by default this change brings ffmpeg into line with that. To obtain the old behaviour use '-color_range jpeg' on the command line prior to the ouput filename. Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pixdesc: clarify AV_PIX_FMT_FLAG_ALPHA doxygenwm42015-02-10
| | | | | | | | | | | | Also make clear that PAL8 can have alpha. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil: check pixdescs in a different placewm42015-02-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing this check in avutil_version() is not appropriate. Also, this code is by default disabled (--assert-level is by default 0). A FATE run with defaults will never execute the checks. Move it to the pixelutils test program. Whatever reason there was in avutil_version() not to run this test by default, it should be fine in this test program. This means FATE will run the test by default. (Yes, pixelutils is not strictly the best place for it either, but it's better.) (pixdesc.c also has a small test program, but it's never run by FATE.) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil: move internal function out of public headerwm42015-02-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: fix clobbered ff_get_buffer()Paul B Mahol2015-02-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | test/fate: added mxf_opatom regression testsMark Reid2015-02-10
| | | | | | | | | | Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mss4: use av_malloc_array()Paul B Mahol2015-02-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/huffman: check if map was allocated tooPaul B Mahol2015-02-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/hevc_parser: check for av_mallocz() failurePaul B Mahol2015-02-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | examples/demuxing_decoding: abort decoding when width, height or pix_fmt changeAndreas Cadhalpun2015-02-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary, because avcodec_decode_video2 can change width, height and/or pixel format of the AVCodecContext. Since video_dst_data and video_dst_linesize are not updated by calling av_image_alloc again, av_image_copy[_plane] asserts, because the destination buffer is too small. In this case, creating a useable rawvideo is not possible anyway, since it has fixed width/height/pix_fmt. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/hevc_sao: make sao_band_filter work on x86_32James Almer2015-02-09
| | | | | | | | | | Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | avutil/camellia: Remove redundant castsMichael Niedermayer2015-02-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/camellia: Fix indention & whitespaceMichael Niedermayer2015-02-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavutil: optimize camellia cipherSupraja Meedinti2015-02-09
| | | | | | | | | | | | | | | | | | | | | | | | Before the changes : lavu CAMELLIA size: 1048576 runs: 1024 time: 32.541 +- 0.044 After the changes: lavu CAMELLIA size: 1048576 runs: 1024 time: 24.589 +- 0.066 Tested with crypto_bench on a Linux x86_64 OS with Intel Core i5-3210M CPU. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroska: don't complain about unknown elementswm42015-02-09
| | | | | | | | | | | | | | | | | | | | | | | | Matroska is an extensible format - unknown elements must be expected. It shouldn't complain about such elements to the user either; it'll just generate noise. The "error_recognition & AV_EF_EXPLODE" is completely, wrong why would it explode on valid files? It's still useful for debugging, so the message is left in place with a higher log level. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Fix division by 0Michael Niedermayer2015-02-09
| | | | | | | | | | | | | | Fixes: signal_sigsegv_14999ef_1188_cov_2888512890_SVA_CL1_E.264 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/sgienc: return meaningful error codePaul B Mahol2015-02-09
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/mov: Check dimensions before setting aspectMichael Niedermayer2015-02-09
| | | | | | | | | | | | | | | | Fixes division by 0 Fixes: asan_heap-uaf_143f420_728_cov_1441472032_HDV_0113.MP4 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample/x86/rematrix_init: Check av_malloc* return codes, forward errorsMichael Niedermayer2015-02-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample/x86/rematrix_init: Use av_mallocz_array()Michael Niedermayer2015-02-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vb: Check for av_mallocz() failureMichael Niedermayer2015-02-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/f_sendcmd: consider it an error if there are no commandsMichael Niedermayer2015-02-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>