summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | avformat/hls: fixed bug where custom http headers weren't kept for hls streamskowalsky2013-11-07
| | | | | | | | See: https://trac.ffmpeg.org/ticket/3024
* | avfilter/af_aresample: Calculate output buffer size more precisely.Michael Niedermayer2013-11-06
| | | | | | | | | | | | Fixes accumulation of data in case of significant silence injections Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segafilm: check 2nd tagMichael Niedermayer2013-11-06
| | | | | | | | | | | | Fixes probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/swfdec: check version and size during probingMichael Niedermayer2013-11-06
| | | | | | | | | | | | Fixes probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rsd: increase probe score, as misdetections are fixedMichael Niedermayer2013-11-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rsd: Check channels and sample_rate fieldsMichael Niedermayer2013-11-06
| | | | | | | | | | | | Fixes probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/libgme: decrease score by 1, fixes probetest failureMichael Niedermayer2013-11-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2013-11-06
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * cus/stable: ffplay: add smarter method for determining video picture duration ffplay: add frame duration estimated from frame rate to VideoPicture ffplay: avoid code duplication in AVFILTER enabled and disabled case Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffplay: add smarter method for determining video picture durationMarton Balint2013-11-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | - consider it an invalid PTS when the next PTS value is the same as the current one - in case of invalid or unknown PTS, return vp->duration This fixes ffplay part of ticket #3005. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: add frame duration estimated from frame rate to VideoPictureMarton Balint2013-11-05
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: avoid code duplication in AVFILTER enabled and disabled caseMarton Balint2013-11-05
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | | avutil/common: error out with clear message if __STDC_CONSTANT_MACROS is not ↵Michael Niedermayer2013-11-05
| | | | | | | | | | | | | | | | | | defined with c++ Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-05
|\ \ \ | |/ / |/| / | |/ | | | | | | * qatar/master: configure: Move -Wno-maybe-uninitialized check into gcc section Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Move -Wno-maybe-uninitialized check into gcc sectionDiego Biurrun2013-11-05
| | | | | | | | | | | | As another example of bizarre compiler behavior clang groks the -Wmaybe-uninitialized option, but not -Wno-maybe-uninitialized and spews a warning for every file that gets compiled.
* | avcodec/vp9: add ff_vp9_idct_idct_{4x4,8x8}_ssse3().Clément Bœsch2013-11-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1789 decicycles in idct_idct_4x4_add_c, 262136 runs, 8 skips 1839 decicycles in idct_idct_4x4_add_c, 524270 runs, 18 skips 1864 decicycles in idct_idct_4x4_add_c, 1048548 runs, 28 skips 529 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 262138 runs, 6 skips 516 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 524282 runs, 6 skips 474 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 1048565 runs, 11 skips (~3.9x faster) 7726 decicycles in idct_idct_8x8_add_c, 1048433 runs, 143 skips 7732 decicycles in idct_idct_8x8_add_c, 2096882 runs, 270 skips 7731 decicycles in idct_idct_8x8_add_c, 4193772 runs, 532 skips 1145 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 1048549 runs, 27 skips 1137 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 2097097 runs, 55 skips 1086 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 4194188 runs, 116 skips (~7.1x faster) Overall decode time before commit: 16.48s user 0.03s system 99% cpu 16.526 total 16.54s user 0.01s system 99% cpu 16.566 total 16.46s user 0.03s system 99% cpu 16.511 total Overall decode time after commit: 16.34s user 0.02s system 99% cpu 16.378 total 16.28s user 0.02s system 99% cpu 16.315 total 16.32s user 0.03s system 99% cpu 16.366 total Tested on i7 920 with 40s 1080p footage.
* | avfilter/opencl: compile kernels separatelyLenny Wang2013-11-05
| | | | | | | | | | Reviewed-by: Wei Gao <highgod0401@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/opencl: compile kernels separatelyLenny Wang2013-11-05
| | | | | | | | | | Reviewed-by: Wei Gao <highgod0401@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mss2: use init_get_bits8()Paul B Mahol2013-11-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/flashsv: use av_freep() for tmpblockPaul B Mahol2013-11-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/mss1: use init_get_bits8()Paul B Mahol2013-11-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lsws/utils: introduce scale_algorithms arrayStefano Sabatini2013-11-05
| | | | | | | | Allow some dumb factorizations, slightly decrease spaghetti factor.
* | avcodec/flashsv: fix typoPaul B Mahol2013-11-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/tscc2: use init_get_bits8()Paul B Mahol2013-11-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/brender_pix: stop calling av_image_check_size() twicePaul B Mahol2013-11-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/flashsv: stop using deprecated avcodec_set_dimensionsPaul B Mahol2013-11-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/flashsv: use init_get_bits8()Paul B Mahol2013-11-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/brender_pix: stop using deprecated avcodec_set_dimensionsPaul B Mahol2013-11-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/c93: stop using deprecated avcodec_set_dimensionsPaul B Mahol2013-11-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-05
|\| | | | | | | | | | | | | | | | | | | * qatar/master: avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer Conflicts: libavfilter/buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avfilter/buffer: Suppress deprecation warning for avfilter_unref_bufferDiego Biurrun2013-11-04
| | | | | | | | The function is used in a block of code that is deprecated anyway.
* | Merge commit '82c86d0b1839b01b3cd0dd848fb6416ff21506dd'Michael Niedermayer2013-11-05
|\| | | | | | | | | | | | | | | * commit '82c86d0b1839b01b3cd0dd848fb6416ff21506dd': graph2dot: Add missing #include for av_get_channel_layout_string() See: 1acd2f6ba7bc85d4aab6f0ebdc56c8d21785640e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * graph2dot: Add missing #include for av_get_channel_layout_string()Diego Biurrun2013-11-04
| |
* | Merge commit '48715285f69d70879353737d7bed049f89f58096'Michael Niedermayer2013-11-05
|\| | | | | | | | | | | | | | | | | * commit '48715285f69d70879353737d7bed049f89f58096': graph2dot: Fix use of deprecated API See: 59360cd456dd038fb28134aff5d9b56302fff488 See: ecade984ac3ce5205f6276a9329e2b7bca09fa47 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * graph2dot: Fix use of deprecated APIDiego Biurrun2013-11-04
| |
* | Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a'Michael Niedermayer2013-11-05
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '70cbf33405f50dfaf77e85f382a188acf17dc71a': vdpau: Add missing #includes to fix standalone header compilation Conflicts: libavcodec/vdpau_internal.h Not completely merged as this would break use of vdpau.h from C++ Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: Add missing #includes to fix standalone header compilationDiego Biurrun2013-11-04
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930'Michael Niedermayer2013-11-05
|\| | | | | | | | | | | | | * commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930': x86: rv40dsp: Use PAVGB instruction macro where appropriate Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: rv40dsp: Use PAVGB instruction macro where appropriateDiego Biurrun2013-11-04
| |
* | avformat/http: print http headers at AV_LOG_DEBUG levelMichael Niedermayer2013-11-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lsws/utils: fix typoStefano Sabatini2013-11-05
| |
* | lavfi/ladspa: cast return value of av_x_if_null to char*, fix warningsStefano Sabatini2013-11-05
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-04
|\| | | | | | | | | | | | | * qatar/master: omadec: loosen format probing constraints Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * omadec: loosen format probing constraintsDavid Goldwich2013-11-04
| | | | | | | | | | | | | | | | | | | | Imporoves detection of some files in the wild: - ID3v2 a.k.a. "ea3" header is optional. - Version and flags in ID3v2 header are unspecified. Signed-off-by: David Goldwich <david.goldwich@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '1c736bedd9891501960ebac0f7c05eb60225e947'Michael Niedermayer2013-11-04
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '1c736bedd9891501960ebac0f7c05eb60225e947': omadec: check GEOB sizes against buffer size Conflicts: libavformat/omadec.c See: e74fa25cb9f29aee8a36df0c8e492f8bafdbe4a0 See: 91e72e35141f590c38985ad0ae3453a4e9e86b8a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * omadec: check GEOB sizes against buffer sizeMichael Niedermayer2013-11-04
| | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: David Goldwich <david.goldwich@gmail.com> CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '97f50e92b5cf3b47a76f75d76ed4340e822030db'Michael Niedermayer2013-11-04
|\| | | | | | | | | | | | | | | * commit '97f50e92b5cf3b47a76f75d76ed4340e822030db': omadec: Fix wrong number of array elements See: 4f5d1468f55eb87bce84845c4e62242c791268f5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * omadec: Fix wrong number of array elementsMichael Niedermayer2013-11-04
| | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: David Goldwich <david.goldwich@gmail.com> CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'e73996954d8e00117056dcefb38ef3d4d2f37967'Michael Niedermayer2013-11-04
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e73996954d8e00117056dcefb38ef3d4d2f37967': filtfmts-test: Fix use of deprecated API Conflicts: libavfilter/filtfmts.c See: f12174c8cef872030a156cbf252f4951c3a6357c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * filtfmts-test: Fix use of deprecated APIDiego Biurrun2013-11-04
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '3ef9b7ab95cc703b67a8b658dca45c80df0aaa66'Michael Niedermayer2013-11-04
|\| | | | | | | | | | | | | * commit '3ef9b7ab95cc703b67a8b658dca45c80df0aaa66': hevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale Merged-by: Michael Niedermayer <michaelni@gmx.at>