virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
58,890 Commits 37 Branches 400 Tags 464 MiB
2fade10cb0
Commit Graph

58890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
anatoly
2fade10cb0 Add support for picture_ptr field in MJpegDecodeContext 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit e0e3b8b297)

Conflicts:

	libavcodec/jpeglsdec.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-09 12:24:50 +01:00
Michael Niedermayer
9eac7c435f Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b' 
* commit 'f0b234ab9e406efee85c17eb435db646092a943b':
  avformat: AviSynth demuxer rewrite

Conflicts:
	configure
	libavformat/avisynth.c

See: b9ad009475 (as well as later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-09 12:03:09 +01:00
Michael Niedermayer
2d4ef7c905 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>
 2013-12-09 04:47:20 +01:00
Michael Niedermayer
8e70fdab36 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>
 2013-12-09 04:12:40 +01:00
James Almer
a12f679a5d 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>
 2013-12-09 02:47:55 +01:00
James Almer
0cde2ae3f1 configure: Move MinGW64 specific check to the correct place 
It was misplaced during merge of commit 120797e2ef

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-09 02:06:21 +01:00
James Almer
5f302b1f38 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>
 2013-12-09 02:02:37 +01:00
Michael Niedermayer
b07da13ac0 avcodec/ffv1enc: support forcing experimental 1.4 version 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-09 00:39:02 +01:00
Michael Niedermayer
7854d2d251 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>
 2013-12-09 00:37:38 +01:00
d s
f0b234ab9e 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>
 2013-12-08 21:54:50 +01:00
Diego Biurrun
19c20a0a1a configure: Move adding of compat objects out of libc detection 2013-12-08 21:09:02 +01:00
Michael Niedermayer
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
Andrey Utkin
c1b9d7189d avformat/rtpdec: Enable GSM RTP depacketization 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-08 18:38:01 +01:00
Alexander Strasser
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
Diego Biurrun
4958f35a2e dsputil: Move apply_window_int16 to ac3dsp 
The (optimized) functions are used nowhere else.
 2013-12-08 17:57:15 +01:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Diego Biurrun
120797e2ef configure: Separate MinGW32 and MinGW64 libc handling 2013-12-08 01:00:36 +01:00
James Almer
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
Guillaume Martres
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
James Almer
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
Michael Niedermayer
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
Ronald S. Bultje
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
Ronald S. Bultje
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
Ronald S. Bultje
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
Ronald S. Bultje
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
0aedf90e62 avutil/opt: factor set_string_color() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-07 14:08:20 +01:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
7f763775aa avformat/utils: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-07 11:59:53 +01:00
Michael Niedermayer
4dfc8f69b2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dcadec: Decode LFE to avoid adding random data when downmixing with LFE

See: 6e7de11444
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-07 11:52:42 +01:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
James Almer
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
Michael Niedermayer
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
Marton Balint
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
Marton Balint
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
Marton Balint
eff4820eb2 ffplay: remove no longer necessary codec flush 
It was introduced in c2e8691c07, 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>
 2013-12-06 19:57:45 +01:00
Marton Balint
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
James Almer
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
Lukasz Marek
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