cf49d5907a
avcodec/ansi: set w/h correctly at the top
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
b568eeba75
Merge commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179'
* commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179':
ansi: fix possible use of uninitialized variables
Conflicts:
libavcodec/ansi.c
Only partially merged, ffmpeg is not affected by this.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
b6413cdc02
Merge commit 'c0bba95c2363641d3297b3852b2ece1474cda295'
* commit 'c0bba95c2363641d3297b3852b2ece1474cda295':
wtv: fix variable sign in format
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
08e7644b68
Merge commit '5858a67f135a7395c548482c73cf3d39bcdd3022'
* commit '5858a67f135a7395c548482c73cf3d39bcdd3022':
attributes: disable flatten on llvm/clang
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
7edc9240a8
Merge commit '3a14b160bd442794c6a16a6a883adb547550e847'
* commit '3a14b160bd442794c6a16a6a883adb547550e847':
vf_scale: make the dar variable return the DAR.
Conflicts:
Changelog
doc/filters.texi
libavfilter/version.h
See: 61d55fda2b
12 years ago
a75bf4e5c1
Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7'
* 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>
12 years ago
3ea5f64fff
ansi: fix possible use of uninitialized variables
12 years ago
c0bba95c23
wtv: fix variable sign in format
12 years ago
5858a67f13
attributes: disable flatten on llvm/clang
12 years ago
8a701ef7dd
avcodec/hevc_sei: Fix null dereference in decode_pic_timing()
Fixes Ticket3106
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
63a37d0e1e
avcodec/hevc_sei: check active_seq_parameter_set_id validity
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
6e87dfb589
mpegvideo: reduce whitespace differences to libav
This excludes many changes that worsen readability
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
4fb1221e66
h264: reduce whitespace differences to libav
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
23c03ac91e
libvpxenc: allow qmax of 0
this is valid for both vp8 & vp9 and necessary for lossless in the
latter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
50f52a5498
avutil/xtea: add Doxy @file and group
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
624672fcce
avutil/adler32: add Doxy group
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
517afd72c6
libvpxenc: add VP9 options
same as their vpxenc equivalents:
-lossless
-tile-columns
-tile-rows
-frame-parallel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
e87043bb1f
MAINTAINERS: add myself for libvpx*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
1fb3b494fa
ffv1enc: store 2pass statistics at the end
This reduces their size from O(n) to O(1)
Fixes Ticket3078
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
8d88ed9a1f
avcodec/ffv1enc: pass through pts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
3a14b160bd
vf_scale: make the dar variable return the DAR.
Before, it just returned width/height. Correct is width/height*sar.
That way it is consistent with DAR as in probe output and setdar.
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years ago
34a0ac41a8
vf_aspect: support variables in evaluating the aspect ratios
Example: -vf setsar=sar="sar*9/10"
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years ago
a8bcc956fd
libvpxenc: split vp8/vp9 options array
the current options are left for both to provide command line compatibility
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
d3211cfaed
avcodec/libmp3lame: add ABR support
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
67d1d06225
Merge remote-tracking branch 'qatar/master'
* qatar/master:
os_support: Add #endif comments for better readability
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
1654e64bba
Merge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58'
* commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58':
mpeg4video_parser: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg4video_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
a805e2e653
avcodec/hevc: add "apply_defdispwin" alias for compatibilty with 064698d381
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
35594c48ca
libavcodec/hevc: random cosmetics to reduce diff to 064698d381
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
2c4f573696
libavcodec/hevc: random cosmetics to reduce diff to 064698d381
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
e877455ff9
libavcodec/hevcdsp_template: whitespaces to reduce diff to 064698d381
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
42dbe2d9b1
libavcodec/hevcdsp_template: random cosmetics to reduce diff to 064698d381
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
69b3668b83
libavcodec/hevc: indention related cosmetics to reduce diff to 064698d381
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
6a84d17bd7
libavcodec/hevcdsp_template: cosmetics to reduce diff to 064698d381
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
b23692b3a8
libavcodec/hevc: reduce whitespace differences to 064698d381
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
5928b29f53
os_support: Add #endif comments for better readability
12 years ago
1a6948fa70
libavcodec/hevc: reduce bracket differences to 064698d381
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
ce7f1c76bd
avcodec/hevc: more whitespaces to reduce difference to 064698d381
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
c68d4c230a
mpeg4video_parser: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
12 years ago
641358addc
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add an HDS live fragmenting muxer
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
1344c04536
Merge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'
* commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0':
mpeg4video: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg4video.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
0b82fdcc46
Merge commit '037fea388e0df2a22441bc1ed86794152161baf1'
* commit '037fea388e0df2a22441bc1ed86794152161baf1':
flashsv: K&R formatting cosmetics
Conflicts:
libavcodec/flashsv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
7146eacfc5
Merge commit '1700b4e678ed329611a16b20d11e64b7abda4839'
* commit '1700b4e678ed329611a16b20d11e64b7abda4839':
x86: vp8dsp: Split loopfilter code into a separate file
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
0db04ca01d
Merge commit '056fd4fe65e70b4dbca97bcf7faf8b7ce3df993f'
* commit '056fd4fe65e70b4dbca97bcf7faf8b7ce3df993f':
configure: Properly check for availability of -Wno-foo warning flags
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
b4f95c96a5
Merge commit '23157d72b565e0228fec97f1eb059d4f8021a260'
* commit '23157d72b565e0228fec97f1eb059d4f8021a260':
configure: Split test_cflags function off from check_cflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
435214a757
Add an HDS live fragmenting muxer
HDS fragments basically are FLV fragments wrapped in an ISO
media mdat atom.
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
02223f4dc4
Merge commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245'
* commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245':
lavf: do not use int to store an int64
Conflicts:
libavformat/utils.c
See: ad56535dd1
12 years ago
525289ed26
Merge commit '57070b1468edc6ac8cb3696c817f3c943975d4c1'
* commit '57070b1468edc6ac8cb3696c817f3c943975d4c1':
flashsv: Check diff_start diff_height values
Conflicts:
libavcodec/flashsv.c
See: 880c73cd76
12 years ago
77c33424c1
Merge commit '4a64e67988dd01005efb1ae831bff14c1656b573'
* commit '4a64e67988dd01005efb1ae831bff14c1656b573':
flashsv: Refactor a little
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
8183e33225
h264_refs: use named constant for setting frame_recovered
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
647adc4290
h264: factor "if(h->sei_recovery_frame_cnt >= 0)" out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
Vittorio Giovara
James Zern
Timothy Gu
Rudolf Polzer
Diego Biurrun
Martin Storsjö