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
59,064 Commits 37 Branches 400 Tags 464 MiB
48016f8feb
Commit Graph

59064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
6f7dbb9cc1 Merge commit '0cdbc4d39394965bd8712395b19160da8f3fe144' 
* commit '0cdbc4d39394965bd8712395b19160da8f3fe144':
  ljpegenc: rename the encoding function.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 13:38:30 +01:00
Michael Niedermayer
6deaab360c Merge commit '72c0b8f724a71d2784aecad0e5221e7ab6206371' 
* commit '72c0b8f724a71d2784aecad0e5221e7ab6206371':
  ljpeg: remove a commented-out line

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 13:37:09 +01:00
Michael Niedermayer
0ebdf8d9ec avcodec/mjpegenc: fix and use lossless flag in ff_mjpeg_encode_picture_header() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 13:31:14 +01:00
Michael Niedermayer
93947d88f2 Merge commit '24abd806ea0cfb0d988d2f0044eac79cff12918c' 
* commit '24abd806ea0cfb0d988d2f0044eac79cff12918c':
  ljpegenc: deMpegEncContextize

Conflicts:
	libavcodec/ljpegenc.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	tests/ref/vsynth/vsynth1-ljpeg
	tests/ref/vsynth/vsynth2-ljpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 13:30:23 +01:00
Michael Niedermayer
d756b2b530 avcodec/ljpegenc: Dont use ff_mjpeg_encode_stuffing() 
This avoids a use of MpegEncContext

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 12:01:28 +01:00
Michael Niedermayer
978ae13f23 avcodec/mjpegenc: move end padding/alignment to ff_mjpeg_escape_FF() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 12:01:28 +01:00
Michael Niedermayer
9fcd58ab26 avcodec/mjpegenc: make escape_FF() non static 
This will be used by ljpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 11:49:53 +01:00
Michael Niedermayer
f2d8e3c031 avcodec/ljpegenc: fix mem allocation failure return code encode_picture_lossless() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 11:49:17 +01:00
Michael Niedermayer
0f057ea3c5 Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d' 
* commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d':
  mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc()

Conflicts:
	libavcodec/mjpegenc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 11:40:30 +01:00
Michael Niedermayer
b342ea603f Merge commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed' 
* commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed':
  mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer()

Conflicts:
	libavcodec/ljpegenc.c
	libavcodec/mjpegenc.c
	libavcodec/mjpegenc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 11:33:07 +01:00
Michael Niedermayer
d8fb209a7f Merge commit '058d5f2feb730846f22c1812e433f92f670ad751' 
* commit '058d5f2feb730846f22c1812e433f92f670ad751':
  mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header()

Conflicts:
	libavcodec/mjpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 11:16:05 +01:00
Stefano Sabatini
8f1edc73a8 lavfi: rename asrc_aevalsrc.c to aeval.c 
The file now contains both source and filter, the new name looks more
appropriate.
 2013-12-06 10:57:28 +01:00
Stefano Sabatini
e424abc3a0 lavfi: add aeval filter 2013-12-06 10:57:26 +01:00
Stefano Sabatini
405b3eb535 lavfi/aevalsrc: duplicate last expression for the missing channels 
Use last expression for the missing channel expressions in case the
channel layout was specified. Enhance flexibility.
 2013-12-06 10:51:12 +01:00