summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7'Michael Niedermayer2013-11-03
|\ | | | | | | | | | | | | | | | | | | | | | | * commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7': vf_aspect: support variables in evaluating the aspect ratios Conflicts: Changelog doc/filters.texi libavfilter/vf_aspect.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_aspect: support variables in evaluating the aspect ratiosRudolf Polzer2013-11-02
| | | | | | | | | | | | | | Example: -vf setsar=sar="sar*9/10" Signed-off-by: Rudolf Polzer <divverent@xonotic.org> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/hevc_sei: Fix null dereference in decode_pic_timing()Michael Niedermayer2013-11-03
| | | | | | | | | | | | Fixes Ticket3106 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/hevc_sei: check active_seq_parameter_set_id validityMichael Niedermayer2013-11-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo: reduce whitespace differences to libavMichael Niedermayer2013-11-03
| | | | | | | | | | | | This excludes many changes that worsen readability Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: reduce whitespace differences to libavMichael Niedermayer2013-11-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvpxenc: allow qmax of 0James Zern2013-11-03
| | | | | | | | | | | | | | this is valid for both vp8 & vp9 and necessary for lossless in the latter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/xtea: add Doxy @file and groupTimothy Gu2013-11-03
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/adler32: add Doxy groupTimothy Gu2013-11-03
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvpxenc: add VP9 optionsJames Zern2013-11-03
| | | | | | | | | | | | | | | | | | | | same as their vpxenc equivalents: -lossless -tile-columns -tile-rows -frame-parallel Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | MAINTAINERS: add myself for libvpx*James Zern2013-11-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1enc: store 2pass statistics at the endMichael Niedermayer2013-11-02
| | | | | | | | | | | | | | | | This reduces their size from O(n) to O(1) Fixes Ticket3078 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ffv1enc: pass through ptsMichael Niedermayer2013-11-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvpxenc: split vp8/vp9 options arrayJames Zern2013-11-02
| | | | | | | | | | | | the current options are left for both to provide command line compatibility Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libmp3lame: add ABR supportTimothy Gu2013-11-02
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-02
|\| | | | | | | | | | | | | * qatar/master: os_support: Add #endif comments for better readability Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * os_support: Add #endif comments for better readabilityDiego Biurrun2013-11-02
| |
* | Merge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58'Michael Niedermayer2013-11-02
|\| | | | | | | | | | | | | | | | | | | * commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58': mpeg4video_parser: K&R formatting cosmetics Conflicts: libavcodec/mpeg4video_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4video_parser: K&R formatting cosmeticsVittorio Giovara2013-11-02
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avcodec/hevc: add "apply_defdispwin" alias for compatibilty with ↵Michael Niedermayer2013-11-02
| | | | | | | | | | | | 064698d381e1e7790f21b0199a8930ea04e2e942 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/hevc: random cosmetics to reduce diff to ↵Michael Niedermayer2013-11-02
| | | | | | | | | | | | 064698d381e1e7790f21b0199a8930ea04e2e942 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/hevc: random cosmetics to reduce diff to ↵Michael Niedermayer2013-11-02
| | | | | | | | | | | | 064698d381e1e7790f21b0199a8930ea04e2e942 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/hevcdsp_template: whitespaces to reduce diff to ↵Michael Niedermayer2013-11-02
| | | | | | | | | | | | 064698d381e1e7790f21b0199a8930ea04e2e942 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/hevcdsp_template: random cosmetics to reduce diff to ↵Michael Niedermayer2013-11-02
| | | | | | | | | | | | 064698d381e1e7790f21b0199a8930ea04e2e942 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/hevc: indention related cosmetics to reduce diff to ↵Michael Niedermayer2013-11-02
| | | | | | | | | | | | 064698d381e1e7790f21b0199a8930ea04e2e942 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/hevcdsp_template: cosmetics to reduce diff to ↵Michael Niedermayer2013-11-02
| | | | | | | | | | | | 064698d381e1e7790f21b0199a8930ea04e2e942 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/hevc: reduce whitespace differences to ↵Michael Niedermayer2013-11-02
| | | | | | | | | | | | 064698d381e1e7790f21b0199a8930ea04e2e942 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/hevc: reduce bracket differences to ↵Michael Niedermayer2013-11-02
| | | | | | | | | | | | 064698d381e1e7790f21b0199a8930ea04e2e942 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/hevc: more whitespaces to reduce difference to ↵Michael Niedermayer2013-11-02
| | | | | | | | | | | | 064698d381e1e7790f21b0199a8930ea04e2e942 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-02
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: Add an HDS live fragmenting muxer Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add an HDS live fragmenting muxerMartin Storsjö2013-11-02
| | | | | | | | | | | | | | HDS fragments basically are FLV fragments wrapped in an ISO media mdat atom. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'Michael Niedermayer2013-11-02
|\| | | | | | | | | | | | | | | | | | | * commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0': mpeg4video: K&R formatting cosmetics Conflicts: libavcodec/mpeg4video.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4video: K&R formatting cosmeticsVittorio Giovara2013-11-01
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '037fea388e0df2a22441bc1ed86794152161baf1'Michael Niedermayer2013-11-02
|\| | | | | | | | | | | | | | | | | | | * commit '037fea388e0df2a22441bc1ed86794152161baf1': flashsv: K&R formatting cosmetics Conflicts: libavcodec/flashsv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flashsv: K&R formatting cosmeticsLuca Barbato2013-11-01
| | | | | | | | | | | | Also improve some log message wording/spelling. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '1700b4e678ed329611a16b20d11e64b7abda4839'Michael Niedermayer2013-11-02
|\| | | | | | | | | | | | | | | | | | | * commit '1700b4e678ed329611a16b20d11e64b7abda4839': x86: vp8dsp: Split loopfilter code into a separate file Conflicts: libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: vp8dsp: Split loopfilter code into a separate fileDiego Biurrun2013-11-01
| |
* | Merge commit '056fd4fe65e70b4dbca97bcf7faf8b7ce3df993f'Michael Niedermayer2013-11-02
|\| | | | | | | | | | | | | | | | | | | * commit '056fd4fe65e70b4dbca97bcf7faf8b7ce3df993f': configure: Properly check for availability of -Wno-foo warning flags Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Properly check for availability of -Wno-foo warning flagsDiego Biurrun2013-11-01
| | | | | | | | | | | | | | | | | | | | | | | | | | For some weird reason gcc does not check if the -Wno disabling variants of warning flags match existing warning flags. Instead it swallows them silently. That is, unless other warning or error messages are generated, because then - for some even more bizarre reason - a complaint about the unknown disable warning flag is issued along with the error or warning message. Thus to check for the availability of a warning disabling option, one needs to check for the enabling variant instead and then add the disabling variant to CFLAGS.
* | Merge commit '23157d72b565e0228fec97f1eb059d4f8021a260'Michael Niedermayer2013-11-02
|\| | | | | | | | | | | | | * commit '23157d72b565e0228fec97f1eb059d4f8021a260': configure: Split test_cflags function off from check_cflags Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Split test_cflags function off from check_cflagsDiego Biurrun2013-11-01
| | | | | | | | This is useful to test flags without directly adding them to CFLAGS.
* | Merge commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245'Michael Niedermayer2013-11-02
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245': lavf: do not use int to store an int64 Conflicts: libavformat/utils.c See: ad56535dd1d7204ea0958decac15e8dfc86162ea Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: do not use int to store an int64Anton Khirnov2013-11-01
| |
* | Merge commit '57070b1468edc6ac8cb3696c817f3c943975d4c1'Michael Niedermayer2013-11-02
|\| | | | | | | | | | | | | | | | | | | | | * commit '57070b1468edc6ac8cb3696c817f3c943975d4c1': flashsv: Check diff_start diff_height values Conflicts: libavcodec/flashsv.c See: 880c73cd76109697447fbfbaa8e5ee5683309446 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flashsv: Check diff_start diff_height valuesMichael Niedermayer2013-11-01
| | | | | | | | | | | | | | Fix out of array accesses. Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4a64e67988dd01005efb1ae831bff14c1656b573'Michael Niedermayer2013-11-02
|\| | | | | | | | | | | | | * commit '4a64e67988dd01005efb1ae831bff14c1656b573': flashsv: Refactor a little Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flashsv: Refactor a littleLuca Barbato2013-11-01
| |
* | h264_refs: use named constant for setting frame_recoveredMichael Niedermayer2013-11-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: factor "if(h->sei_recovery_frame_cnt >= 0)" outMichael Niedermayer2013-11-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/hevc: Adjust white-spaces to reduce difference to ↵Michael Niedermayer2013-11-02
| | | | | | | | | | | | 064698d381e1e7790f21b0199a8930ea04e2e942 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>