1b26460788
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: Separate MinGW32 and MinGW64 libc handling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-08 19:01:02 +01:00
c1b9d7189d
avformat/rtpdec: Enable GSM RTP depacketization
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-08 18:38:01 +01:00
cea5812fa7
configure: Special case libfreetype test
...
Include the freetype header, in-directly through a macro, like it
is done in the drawtext filter. Do not break if the header is moved.
Unfortunately the drawtext filter included the file where the include
macros are defined in a wrong way. This is not needed and breaks the
build. Remove that #include line too.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2013-12-08 18:21:46 +01:00
bc9cee98c0
avfilter/vf_mergeplanes: specify pixel format min/max
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-08 16:07:19 +01:00
6faf426470
avcodec/mpeg4video: fix 2 more incorrectly associated comments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-08 16:06:23 +01:00
eb87d1f678
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libvpx: do not mark VP9 as experimental when using libvpx >= 1.3.0
Conflicts:
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-08 13:49:16 +01:00
120797e2ef
configure: Separate MinGW32 and MinGW64 libc handling
2013-12-08 01:00:36 +01:00
ae330070ee
libvpxenc: token_parts is VP8 specific
...
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-08 00:38:40 +01:00
9aa053cede
libvpx: do not mark VP9 as experimental when using libvpx >= 1.3.0
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-12-08 00:28:27 +01:00
e2f800f8b7
windres: Track dependencies
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-07 19:10:27 +01:00
d042c8251d
Merge remote-tracking branch 'rbultje/vp9-simd'
...
* rbultje/vp9-simd:
vp9: implement top/left half (4x4) sub-8x8-IDCT.
vp9: split pre-load of 11585x2 out of 1d idct macro.
vp9: minor refactorings in idct ssse3 assembly.
vp9: split x86 assembly in two files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-07 19:00:09 +01:00
92436e8ad9
vp9: implement top/left half (4x4) sub-8x8-IDCT.
...
For that specific case (eob>3&&eob<=12), runtime of idct8x8 goes from
668 to 477 cycles. For all idct8x8, runtime goes from 521 to 490 cycles.
2013-12-07 12:39:36 -05:00
b2045c44a9
vp9: split pre-load of 11585x2 out of 1d idct macro.
...
This allows us to load it only once, instead of twice, in this function.
2013-12-07 12:39:36 -05:00
f9a0d4c6e0
vp9: minor refactorings in idct ssse3 assembly.
...
Make register usage in macros explicit; change mulsub_2w_4x to use 2
instead of 3 temp registers.
2013-12-07 12:39:35 -05:00
8729964b99
vp9: split x86 assembly in two files.
...
(And in future, loopfilter or intra pred could be put in their own
respective files also.)
2013-12-07 12:39:35 -05:00
c6959918f6
Merge remote-tracking branch 'cus/stable'
...
* cus/stable:
ffplay: set default window size before starting audio
ffplay: factor out function setting default window size
ffplay: remove no longer necessary codec flush
ffplay: do not wait for flushing the picture queue on flush packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-07 16:11:25 +01:00
e8ac905dae
avutil/opt: Implement av_opt_set_defaults* in O(N) instead of O(N²) time
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-07 14:09:36 +01:00
0aedf90e62
avutil/opt: factor set_string_color() out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-07 14:08:20 +01:00
758d4e4067
avutil/opt: factor set_string_video_rate() out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-07 14:08:19 +01:00
9648c4fe9c
avutil/opt: factor set_string_image_size() out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-07 14:07:52 +01:00
7f763775aa
avformat/utils: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-07 11:59:53 +01:00
4dfc8f69b2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
dcadec: Decode LFE to avoid adding random data when downmixing with LFE
See: 6e7de11444
2013-12-07 11:52:42 +01:00
1770da18f7
avformat/utils: reject poorly fitting rfps values earlier
...
This avoids collecting statistics for rfps values that very likely
will get rejected later.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-07 04:20:05 +01:00
ba189b1db4
avformat/mov: use rfps_add_frame() only for video
...
it makes no sense for other streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-07 03:23:49 +01:00
4d18060e56
swscale/utils: fill xyz tables only when they will be used
...
makes the first call to sws_getContext() 1ms faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-07 02:04:31 +01:00
f52852098d
avutil/utils: run ff_check_pixfmt_descriptors() only when ASSERT_LEVEL is > 0
...
this safes about 0.1ms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 23:51:58 +01:00
b6a9719941
dcadec: Decode LFE to avoid adding random data when downmixing with LFE
...
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-12-06 23:37:05 +01:00
a044a183a3
avutil/log: skip IO calls on empty strings
...
These occur when no context is set for example, thus they are common
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 23:30:34 +01:00
d6838309fe
avutil/log: skip setting color for default (AV_LOG_INFO) level
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 23:28:57 +01:00
2c21e2ee4c
avutil/log: merge calls that set ansi color and print the string
...
about 1/3 or so faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 23:27:45 +01:00
22ef9cb46d
avresample: Include libavutil/avutil.h in version.h
...
Should fix issues compiling lavr's Windows resource file.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 22:13:20 +01:00
59398c1342
Merge remote-tracking branch 'lukaszmluki/master'
...
* lukaszmluki/master:
lavd/fbdev_enc: add default device
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 20:26:48 +01:00
ad01fae86d
ffplay: set default window size before starting audio
...
Fixes ticket #2381 .
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-12-06 19:57:45 +01:00
2b377fb4c0
ffplay: factor out function setting default window size
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-12-06 19:57:45 +01:00
eff4820eb2
ffplay: remove no longer necessary codec flush
...
It was introduced in c2e8691c07
2013-12-06 19:57:45 +01:00
318bf57c3f
ffplay: do not wait for flushing the picture queue on flush packet
...
It is no longer necessary. Also do frame timer and video current pos reset in
the main thread because with the wait removed, the timing would not be optimal
in the read thread.
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-12-06 19:57:44 +01:00
618bdb7f58
lavf/mux: Don't write "encoder" metadata tag when bitexact is requested
...
Since we don't write lavf's string when bitexact is requested, this will
prevent the tag from being copied from the source stream.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 19:33:41 +01:00
fa3bfeb1c1
lavd/fbdev_enc: add default device
...
Use device specified by environment variable FRAMEBUFFER or /dev/fb0 as default.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2013-12-06 19:15:47 +01:00
90539cea33
avcodec/error_resilience: check that er is supported before attempting to read the status of the previous slice
...
Fixes incorrectly set error_occured and improves speed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 16:49:35 +01:00
afb18c5578
avcodec/error_resilience: factor er_supported() check out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 16:49:00 +01:00
976fc5911c
avcodec/qdm2: move static init to normal init to avoid initializing tables that might never be used
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 15:40:44 +01:00
133fbfc781
do O(1) instead of O(n) atomic operations in register functions
...
about 1ms faster startup time
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 15:27:36 +01:00
2b215f3939
mjpeg/ljpegenc: factor ff_mjpeg_init_hvsample() out
...
This reduces the amount of duplicated code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 14:31:23 +01:00
535af2c222
avcodec/mpegvideo_enc/frame_end(): remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 14:19:33 +01:00
9a0d719b10
avcodec/mjpegenc/ff_mjpeg_escape_FF: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 14:19:11 +01:00
82c7d704fd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
webp: add a special case for a huffman table with only 1 symbol
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 14:13:33 +01:00
db44eff197
Merge commit 'f51e3a1971045c7ed0c3d9d29d3254a4d940198e'
...
* commit 'f51e3a1971045c7ed0c3d9d29d3254a4d940198e':
webp: do not call av_frame_free() on the user-provided frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 14:07:08 +01:00
711c664a0e
Merge commit 'b73a8922d818c7f909855557718d4c3bfacbd92d'
...
* commit 'b73a8922d818c7f909855557718d4c3bfacbd92d':
ljpegenc: split yuv encoding into a separate function
Conflicts:
libavcodec/ljpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 14:01:54 +01:00
1fd323f31e
Merge commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5'
...
* commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5':
ljpegenc: split bgr encoding into a separate function
Conflicts:
libavcodec/ljpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 13:55:37 +01:00
fb98ca575d
Merge commit 'daffed3b173c59d64907747bf3309e98a8974f4e'
...
* commit 'daffed3b173c59d64907747bf3309e98a8974f4e':
ljpegenc: accept bgr24 instead of bgra
Conflicts:
libavcodec/ljpegenc.c
libavcodec/mjpegenc.c
Only whitespace merged, we continue to support both formats
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 13:48:20 +01:00
Michael Niedermayer
Andrey Utkin
Alexander Strasser
Diego Biurrun
James Almer
Guillaume Martres
Ronald S. Bultje
Marton Balint
Lukasz Marek