]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Mon, 9 Dec 2013 19:52:14 +0000 (20:52 +0100)]
Merge commit '
d64341e498fa46c6cf4c23d408177d7489559654 '
* commit '
d64341e498fa46c6cf4c23d408177d7489559654 ':
configure: Prefix libc-related variables with "libc_"
Conflicts:
libavdevice/Makefile
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 19:45:42 +0000 (20:45 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix remuxing of IMA_QT in mov.
Do not detect "
00000000 ..." (and other non-changing values) as adp.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 19:38:17 +0000 (20:38 +0100)]
Merge commit '
61b203ffe6c71789acb14f51483d63fe9e516842 '
* commit '
61b203ffe6c71789acb14f51483d63fe9e516842 ':
configure: detect Solaris libc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 19:31:29 +0000 (20:31 +0100)]
Merge commit '
9b8d11a76ae7bca8bbb58abb822138f8b42c776c '
* commit '
9b8d11a76ae7bca8bbb58abb822138f8b42c776c ':
avcodec: Use av_reallocp where suitable
Conflicts:
libavcodec/bitstream.c
libavcodec/eatgv.c
libavcodec/flashsv.c
libavcodec/libtheoraenc.c
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 19:06:39 +0000 (20:06 +0100)]
Merge commit '
d4f1188d1a662fed5347e70016da49e01563e8a8 '
* commit '
d4f1188d1a662fed5347e70016da49e01563e8a8 ':
dv: use AVFrame API properly
Conflicts:
libavcodec/dvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 18:57:58 +0000 (19:57 +0100)]
Merge commit '
c9ca220ef26e36abd22085e6fa156c0dbc43bbf0 '
* commit '
c9ca220ef26e36abd22085e6fa156c0dbc43bbf0 ':
ac3dec: make drc_scale exponentially
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 17:58:41 +0000 (18:58 +0100)]
Merge commit '
37a749012aaacc801fe860428417a6d7b81c103f '
* commit '
37a749012aaacc801fe860428417a6d7b81c103f ':
lavc: rework handling of refcounted_frames=0
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 17:06:52 +0000 (18:06 +0100)]
Merge commit '
df7aba52b51007db50410abe15fe28391abd8757 '
* commit '
df7aba52b51007db50410abe15fe28391abd8757 ':
frame: cosmetics, reindent
Conflicts:
libavutil/frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 16:59:33 +0000 (17:59 +0100)]
Merge commit '
c342132fa8a29692e28c98238e3a31da5c407e42 '
* commit '
c342132fa8a29692e28c98238e3a31da5c407e42 ':
frame: copy flags in av_frame_copy_props()
Conflicts:
libavutil/frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 16:48:24 +0000 (17:48 +0100)]
Merge commit '
a1ee1648690726b34e98eaf8db04fd7b3303cfc8 '
* commit '
a1ee1648690726b34e98eaf8db04fd7b3303cfc8 ':
lavc/decode_video(): always unref the frame if there is no output in decode_video
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 15:13:37 +0000 (16:13 +0100)]
Merge commit '
85f947aefb3dae81f65f518acdffa8e31c679654 '
* commit '
85f947aefb3dae81f65f518acdffa8e31c679654 ':
lavc: remove a pointless check in decode_audio4()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 15:07:17 +0000 (16:07 +0100)]
Merge commit '
d4f0f2d1e80b76260eb6b9cdde472ac069dfda56 '
* commit '
d4f0f2d1e80b76260eb6b9cdde472ac069dfda56 ':
lavc: use buf[0] instead of data[0] as the indicator of an allocated frame
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 12:31:23 +0000 (13:31 +0100)]
Merge commit '
e5419709f50593769037ab77d7102f82d9260784 '
* commit '
e5419709f50593769037ab77d7102f82d9260784 ':
lavc: remove the extended_data workarounds.
Conflicts:
libavcodec/utils.c
One hunk is not merged as not all codecs are updated yet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 9 Dec 2013 13:24:46 +0000 (14:24 +0100)]
Fix remuxing of IMA_QT in mov.
Fixes ticket #1603.
Carl Eugen Hoyos [Mon, 9 Dec 2013 12:51:00 +0000 (13:51 +0100)]
Do not detect "
00000000 ..." (and other non-changing values) as adp.
Michael Niedermayer [Mon, 9 Dec 2013 12:19:50 +0000 (13:19 +0100)]
Merge commit '
d351ef47d0e0ccb7de96b37f137c16b2885580ac '
* commit '
d351ef47d0e0ccb7de96b37f137c16b2885580ac ':
pthread_frame: use the AVFrame API properly.
Conflicts:
libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 31 Oct 2013 00:24:07 +0000 (01:24 +0100)]
Revert: flvenc: Don't pretend to support muxing "plain" VP6
Muxing VP6 is used by applications and works with Flashplayer.
Reported-by: David Bertrand
Michael Niedermayer [Mon, 9 Dec 2013 12:02:16 +0000 (13:02 +0100)]
Merge commit '
b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c '
* commit '
b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c ':
mxpegdec: use the AVFrame API properly.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 11:54:59 +0000 (12:54 +0100)]
Merge commit '
afa21a12bf084f905187615706b0a8d92bc98661 '
* commit '
afa21a12bf084f905187615706b0a8d92bc98661 ':
p*menc: use the AVFrame API properly.
Conflicts:
libavcodec/Makefile
libavcodec/pamenc.c
libavcodec/pnmenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 11:32:37 +0000 (12:32 +0100)]
Merge commit '
e2274aa555f023e4f4e4819bf29b2d7e0adec7d5 '
* commit '
e2274aa555f023e4f4e4819bf29b2d7e0adec7d5 ':
mjpegdec: use the AVFrame API properly.
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
anatoly [Sun, 27 Mar 2011 20:16:25 +0000 (22:16 +0200)]
Add support for picture_ptr field in MJpegDecodeContext
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit
e0e3b8b297bae5144f23fd4b46a1309857040b63 )
Conflicts:
libavcodec/jpeglsdec.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 10:44:37 +0000 (11:44 +0100)]
Merge commit '
f0b234ab9e406efee85c17eb435db646092a943b '
* commit '
f0b234ab9e406efee85c17eb435db646092a943b ':
avformat: AviSynth demuxer rewrite
Conflicts:
configure
libavformat/avisynth.c
See:
b9ad009475f3afb76bd2fbd92936dc4d4cd441ec (as well as later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 4 Dec 2013 17:21:30 +0000 (12:21 -0500)]
configure: Prefix libc-related variables with "libc_"
Simplifies host/target libc detection splitting.
Sean McGovern [Sun, 8 Dec 2013 22:17:12 +0000 (17:17 -0500)]
configure: detect Solaris libc
Add preprocessor flags for API availability as necessary.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Alexandra Khirnova [Fri, 6 Dec 2013 12:44:17 +0000 (13:44 +0100)]
avcodec: Use av_reallocp where suitable
Signed-off-by: Martin Storsjö <martin@martin.st>
Anton Khirnov [Fri, 29 Nov 2013 07:58:10 +0000 (08:58 +0100)]
dv: use AVFrame API properly
John Stebbins [Wed, 20 Nov 2013 17:26:45 +0000 (09:26 -0800)]
ac3dec: make drc_scale exponentially
The a52 spec suggests that "partial compression" should scale the
drc value in this manner.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Fri, 29 Nov 2013 19:49:18 +0000 (20:49 +0100)]
lavc: rework handling of refcounted_frames=0
Use only proper AVFrame API (no assigning of whole frames, since that
hardcodes sizeof(AVFrame) into lavc).
Make a copy of the side data, so the caller can use av_frame_unref/free
on non-refcounted frames, eliminating the need for
avcodec_get_frame_defaults()/avcodec_free_frame().
Anton Khirnov [Fri, 29 Nov 2013 19:41:35 +0000 (20:41 +0100)]
frame: cosmetics, reindent
Anton Khirnov [Fri, 29 Nov 2013 19:40:34 +0000 (20:40 +0100)]
frame: copy flags in av_frame_copy_props()
Flags can be considered metadata (at least those that are defined now).
Anton Khirnov [Fri, 29 Nov 2013 19:20:20 +0000 (20:20 +0100)]
lavc/decode_video(): always unref the frame if there is no output in decode_video
Not just on failure. This is the same thing that is done in the audio
path and should prevent leaks in decoders that allocate a frame, but
then end up not writing into it.
Anton Khirnov [Fri, 29 Nov 2013 19:19:27 +0000 (20:19 +0100)]
lavc: remove a pointless check in decode_audio4()
av_frame_unref() works fine on unallocated frames.
Anton Khirnov [Fri, 29 Nov 2013 19:16:07 +0000 (20:16 +0100)]
lavc: use buf[0] instead of data[0] as the indicator of an allocated frame
data[0] may be NULL for valid frames with hwaccel pixel formats.
Anton Khirnov [Sat, 9 Nov 2013 18:57:14 +0000 (19:57 +0100)]
lavc: remove the extended_data workarounds.
All decoders should now handle it properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
pthread_frame: use the AVFrame API properly.
Remove the extended_data workaround, all decoders should now handle this
properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
mxpegdec: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
p*menc: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
mjpegdec: use the AVFrame API properly.
Michael Niedermayer [Mon, 9 Dec 2013 03:46:24 +0000 (04:46 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Move adding of compat objects out of libc detection
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 03:12:40 +0000 (04:12 +0100)]
Merge commit '
4958f35a2ebc307049ff2104ffb944f5f457feb3 '
* commit '
4958f35a2ebc307049ff2104ffb944f5f457feb3 ':
dsputil: Move apply_window_int16 to ac3dsp
Conflicts:
libavcodec/arm/ac3dsp_init_arm.c
libavcodec/arm/ac3dsp_neon.S
libavcodec/x86/ac3dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 9 Dec 2013 01:44:52 +0000 (22:44 -0300)]
common.mak: Less ugly version of the previous windres fix
Using subst here is a really ugly hack
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 8 Dec 2013 19:13:07 +0000 (16:13 -0300)]
configure: Move MinGW64 specific check to the correct place
It was misplaced during merge of commit
120797e2ef0ca317daf63ad79be5f72f835e9ac2
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 8 Dec 2013 18:57:36 +0000 (15:57 -0300)]
common.mak: fix the current fate failures with windres
Tested-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 8 Dec 2013 23:39:02 +0000 (00:39 +0100)]
avcodec/ffv1enc: support forcing experimental 1.4 version
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 8 Dec 2013 21:09:50 +0000 (22:09 +0100)]
avcodec/ffv1: support adjusting the g vs r + b coefficient in the RCT
about 1% better compression
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
d s [Wed, 27 Nov 2013 02:58:28 +0000 (21:58 -0500)]
avformat: AviSynth demuxer rewrite
Directly loads AviSynth through LoadLibrary instead of relying on
Video for Windows, and supports using AvxSynth (via dlopen) to
open scripts on Linux and OS X.
Error messages from AviSynth/AvxSynth are now reported through
av_log and exit, rather than the traditional behavior of generating
an error video that the user would need to watch to diagnose.
The main rewrite was authored by d s <avxsynth.testing@gmail.com>
from the AvxSynth team, with additional contributions by
Oka Motofumi <chikuzen.mo@gmail.com>
Stephen Hutchinson <qyot27@gmail.com>
Diego Biurrun <diego@biurrun.de>
Anton Khirnov <anton@khirnov.net>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diego Biurrun [Mon, 2 Dec 2013 04:06:02 +0000 (23:06 -0500)]
configure: Move adding of compat objects out of libc detection
Michael Niedermayer [Sun, 8 Dec 2013 18:00:28 +0000 (19:00 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Separate MinGW32 and MinGW64 libc handling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Thu, 5 Dec 2013 20:35:03 +0000 (22:35 +0200)]
avformat/rtpdec: Enable GSM RTP depacketization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alexander Strasser [Fri, 6 Dec 2013 16:20:26 +0000 (17:20 +0100)]
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>
Diego Biurrun [Fri, 6 Dec 2013 12:22:40 +0000 (12:22 +0000)]
dsputil: Move apply_window_int16 to ac3dsp
The (optimized) functions are used nowhere else.
Michael Niedermayer [Sat, 7 Dec 2013 14:41:40 +0000 (15:41 +0100)]
avfilter/vf_mergeplanes: specify pixel format min/max
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 8 Dec 2013 15:05:47 +0000 (16:05 +0100)]
avcodec/mpeg4video: fix 2 more incorrectly associated comments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 8 Dec 2013 12:49:16 +0000 (13:49 +0100)]
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>
Diego Biurrun [Mon, 2 Dec 2013 05:12:57 +0000 (00:12 -0500)]
configure: Separate MinGW32 and MinGW64 libc handling
James Almer [Sat, 7 Dec 2013 19:33:58 +0000 (16:33 -0300)]
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>
Guillaume Martres [Fri, 15 Nov 2013 22:28:30 +0000 (23:28 +0100)]
libvpx: do not mark VP9 as experimental when using libvpx >= 1.3.0
Signed-off-by: Diego Biurrun <diego@biurrun.de>
James Almer [Sat, 7 Dec 2013 02:45:05 +0000 (23:45 -0300)]
windres: Track dependencies
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Dec 2013 18:00:03 +0000 (19:00 +0100)]
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>
Ronald S. Bultje [Mon, 2 Dec 2013 02:27:34 +0000 (21:27 -0500)]
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.
Ronald S. Bultje [Mon, 2 Dec 2013 13:03:04 +0000 (08:03 -0500)]
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.
Ronald S. Bultje [Mon, 2 Dec 2013 13:02:43 +0000 (08:02 -0500)]
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.
Ronald S. Bultje [Sun, 1 Dec 2013 21:27:16 +0000 (16:27 -0500)]
vp9: split x86 assembly in two files.
(And in future, loopfilter or intra pred could be put in their own
respective files also.)
Michael Niedermayer [Sat, 7 Dec 2013 15:11:22 +0000 (16:11 +0100)]
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>
Michael Niedermayer [Sat, 7 Dec 2013 11:41:09 +0000 (12:41 +0100)]
avutil/opt: Implement av_opt_set_defaults* in O(N) instead of O(N²) time
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Dec 2013 12:09:33 +0000 (13:09 +0100)]
avutil/opt: factor set_string_color() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Dec 2013 12:04:38 +0000 (13:04 +0100)]
avutil/opt: factor set_string_video_rate() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Dec 2013 12:01:38 +0000 (13:01 +0100)]
avutil/opt: factor set_string_image_size() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Dec 2013 10:59:53 +0000 (11:59 +0100)]
avformat/utils: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Dec 2013 10:48:25 +0000 (11:48 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dcadec: Decode LFE to avoid adding random data when downmixing with LFE
See:
6e7de1144436a6871fdbd7859f3a2ece6e89d9fb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Dec 2013 03:13:44 +0000 (04:13 +0100)]
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>
Michael Niedermayer [Sat, 7 Dec 2013 02:23:49 +0000 (03:23 +0100)]
avformat/mov: use rfps_add_frame() only for video
it makes no sense for other streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Dec 2013 01:04:31 +0000 (02:04 +0100)]
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>
Michael Niedermayer [Fri, 6 Dec 2013 22:51:58 +0000 (23:51 +0100)]
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>
Michael Niedermayer [Thu, 5 Dec 2013 20:06:28 +0000 (21:06 +0100)]
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>
Michael Niedermayer [Fri, 6 Dec 2013 22:30:34 +0000 (23:30 +0100)]
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>
Michael Niedermayer [Fri, 6 Dec 2013 22:28:57 +0000 (23:28 +0100)]
avutil/log: skip setting color for default (AV_LOG_INFO) level
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 22:27:45 +0000 (23:27 +0100)]
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>
James Almer [Fri, 6 Dec 2013 01:14:19 +0000 (22:14 -0300)]
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>
Michael Niedermayer [Fri, 6 Dec 2013 19:26:41 +0000 (20:26 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/fbdev_enc: add default device
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sun, 1 Dec 2013 13:21:25 +0000 (14:21 +0100)]
ffplay: set default window size before starting audio
Fixes ticket #2381.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 1 Dec 2013 12:25:05 +0000 (13:25 +0100)]
ffplay: factor out function setting default window size
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 30 Nov 2013 20:18:05 +0000 (21:18 +0100)]
ffplay: remove no longer necessary codec flush
It was introduced in
c2e8691c07ca52de7b6b00ba8f2b30c56fd786d7 , but since we no
longer no longer provide a custom get_buffer callback, the original cause of
the issue is gone.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 24 Nov 2013 21:51:13 +0000 (22:51 +0100)]
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>
James Almer [Fri, 6 Dec 2013 03:35:35 +0000 (00:35 -0300)]
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>
Lukasz Marek [Thu, 7 Nov 2013 18:06:38 +0000 (19:06 +0100)]
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>
Michael Niedermayer [Fri, 6 Dec 2013 15:49:35 +0000 (16:49 +0100)]
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>
Michael Niedermayer [Fri, 6 Dec 2013 15:49:00 +0000 (16:49 +0100)]
avcodec/error_resilience: factor er_supported() check out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 14:38:20 +0000 (15:38 +0100)]
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>
Michael Niedermayer [Fri, 6 Dec 2013 14:24:10 +0000 (15:24 +0100)]
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>
Michael Niedermayer [Fri, 6 Dec 2013 13:24:06 +0000 (14:24 +0100)]
mjpeg/ljpegenc: factor ff_mjpeg_init_hvsample() out
This reduces the amount of duplicated code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 13:19:33 +0000 (14:19 +0100)]
avcodec/mpegvideo_enc/frame_end(): remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 13:19:11 +0000 (14:19 +0100)]
avcodec/mjpegenc/ff_mjpeg_escape_FF: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 13:13:19 +0000 (14:13 +0100)]
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>
Michael Niedermayer [Fri, 6 Dec 2013 13:06:53 +0000 (14:06 +0100)]
Merge commit '
f51e3a1971045c7ed0c3d9d29d3254a4d940198e '
* commit '
f51e3a1971045c7ed0c3d9d29d3254a4d940198e ':
webp: do not call av_frame_free() on the user-provided frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 13:01:54 +0000 (14:01 +0100)]
Merge commit '
b73a8922d818c7f909855557718d4c3bfacbd92d '
* commit '
b73a8922d818c7f909855557718d4c3bfacbd92d ':
ljpegenc: split yuv encoding into a separate function
Conflicts:
libavcodec/ljpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 12:55:37 +0000 (13:55 +0100)]
Merge commit '
fa4476815d0d27996eb199452f2cdbfccdd244a5 '
* commit '
fa4476815d0d27996eb199452f2cdbfccdd244a5 ':
ljpegenc: split bgr encoding into a separate function
Conflicts:
libavcodec/ljpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 12:48:20 +0000 (13:48 +0100)]
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>
Michael Niedermayer [Fri, 6 Dec 2013 12:38:17 +0000 (13:38 +0100)]
Merge commit '
0cdbc4d39394965bd8712395b19160da8f3fe144 '
* commit '
0cdbc4d39394965bd8712395b19160da8f3fe144 ':
ljpegenc: rename the encoding function.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 12:37:04 +0000 (13:37 +0100)]
Merge commit '
72c0b8f724a71d2784aecad0e5221e7ab6206371 '
* commit '
72c0b8f724a71d2784aecad0e5221e7ab6206371 ':
ljpeg: remove a commented-out line
Merged-by: Michael Niedermayer <michaelni@gmx.at>