RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
60,146 Commits 36 Branches 398 Tags 232 MiB
Commit Graph

60146 Commits

Author SHA1 Message Date
Reinhard Tartler 210881110d Prepare for 10_alpha2 Release 2014-01-18 10:27:27 -05:00
Michael Niedermayer 0117ba5594 avcodec/mpegvideo_enc: fix custom matrixes with jpeg 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-18 06:33:45 +01:00
Loren Merritt 4d55fe7204 x86inc: speed up compilation with yasm 
Work around yasm's inefficiency with handling large numbers of variables
in the global scope.
 2014-01-18 01:19:16 +01:00
Michael Niedermayer 740e6042a0 ffmpeg: change ost->finished to an enum 
Idea-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 23:57:02 +01:00
Michael Niedermayer d73f897669 ffmpeg: update statistics only when a packet is actually muxed 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 23:47:39 +01:00
Michael Niedermayer 5c459504f6 ffmpeg/flush_encoders: dont mux packets once ost->finished has been set 
Fixes muxing frames after av_interleaved_write_frame() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 23:47:38 +01:00
Michael Niedermayer 706741e8d7 ffmpeg: properly close down muxers on av_interleaved_write_frame() failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 23:47:38 +01:00
Michael Niedermayer 4ff77d4451 ffmpeg: check ost->finished in check_output_constraints() 
No testcase but it seems logic to stop when finished is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 23:47:37 +01:00
Michael Niedermayer 7d91fb305e ffmpeg: check ost->finished in reap_filters() 
This avoids finished output streams continuing to receive frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 23:47:36 +01:00
Michael Niedermayer ed7f1a5c20 avformat/metadata: allow ff_metadata_conv() to be called with NULL saftely 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 23:09:52 +01:00
João Bernardo 447d71b892 avfilter/vf_elbg: Fixed seed range of elbg filter 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 21:17:43 +01:00
Michael Niedermayer 19df5dcb47 avcodec/dnxhdenc: check that qmax is within the supported range 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 20:58:43 +01:00
Michael Niedermayer f1caaa1c61 dnxhdenc: fix mb_rc size 
Fixes out of array access with RC_VARIANCE set to 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 20:24:36 +01:00
Michael Niedermayer ee27b11306 avformat/riff: fix demuxing of h264 INMC 
Its said that there was a mpeg4 sample with the same fourcc, but noone has it
if someone finds it please tell me so i can fix detection of both.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 17:58:36 +01:00
Michael Niedermayer 68ed0b6cd1 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Fix libxvid crash on failing initialisation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 16:57:49 +01:00
Michael Niedermayer f1edf881ef Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avisynth: fix setting packet properties

See: 4cb9c20136
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 16:45:43 +01:00
Michael Niedermayer cd259cdaa9 Merge commit '104a97beaffa6348e6fd2c2d07d67c1402322bb3' 
* commit '104a97beaffa6348e6fd2c2d07d67c1402322bb3':
  buffersrc: handle non-refcounted frames in av_buffersrc_add_frame() correctly

Conflicts:
	libavfilter/buffersrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 16:38:10 +01:00
Michael Niedermayer 6e2d3ba0ee Merge commit '5ef11b8dcc054b230deb9b20493255c14a80597d' 
* commit '5ef11b8dcc054b230deb9b20493255c14a80597d':
  yuv4mpeg: set average frame rate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 16:18:40 +01:00
Michael Niedermayer 206c06d96f Merge commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683' 
* commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683':
  avconv: print a warning when falling back to default 25fps

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 16:11:53 +01:00
Michael Niedermayer 58770db2ae Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7' 
* commit '33018907bd07b34e0e70d5ae12097265eb3734d7':
  mp3enc: allow omitting the id3v2 header with -id3v2_version 0

Conflicts:
	doc/muxers.texi
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 15:34:24 +01:00
Michael Niedermayer 5049b6a1fe Merge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd' 
* commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd':
  mp3enc: add an option for disabling the Xing frame.

Conflicts:
	doc/muxers.texi
	libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 15:23:11 +01:00
Michael Niedermayer 045d80076a Merge commit '045654f422e74be8ed09a0819d39051d67633a09' 
* commit '045654f422e74be8ed09a0819d39051d67633a09':
  doxy: Document better the available AVFrame flags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 15:05:24 +01:00
Michael Niedermayer 68ebf70f66 Merge commit 'ff23c4e4935e96e62d8ff2212a1955a43add88e1' 
* commit 'ff23c4e4935e96e62d8ff2212a1955a43add88e1':
  doxy: Add AVFrame to the structured modules

Conflicts:
	libavutil/frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 14:55:08 +01:00
Carl Eugen Hoyos ee3fc8aa86 Fix libxvid crash on failing initialisation. 
Fixes ticket #3297.
 2014-01-17 14:52:55 +01:00
Michael Niedermayer c8b99f8ad0 Merge commit '87acd33c092ab9e7d73686627e9105d99c1e4928' 
* commit '87acd33c092ab9e7d73686627e9105d99c1e4928':
  aviocat: Add support for specifying the input duration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 14:38:33 +01:00
Michael Niedermayer 9f3a555b84 Merge commit '03f2de5856ec8571fcf5f4cf6dccc713294af545' 
* commit '03f2de5856ec8571fcf5f4cf6dccc713294af545':
  aviocat: Check the argv array length before reading element i+1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 14:31:19 +01:00
James Almer d2a7314f1e vp9/x86: add ff_vp9_loop_filter_[vh]_16_16_sse2(). 
Similar gains in performance as the SSSE3 version

Signed-off-by: James Almer <jamrial@gmail.com>
 2014-01-17 14:16:38 +01:00
Michael Niedermayer c9db8694a8 avisynth: fix setting packet properties 
Reviewed-by: Stephen Hutchinson <qyot27@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-01-17 11:11:08 +01:00
Anton Khirnov 104a97beaf buffersrc: handle non-refcounted frames in av_buffersrc_add_frame() correctly 2014-01-17 10:30:45 +01:00
Anton Khirnov 5ef11b8dcc yuv4mpeg: set average frame rate 2014-01-17 10:30:45 +01:00
Anton Khirnov 2ce8bca51f avconv: print a warning when falling back to default 25fps 2014-01-17 10:30:45 +01:00
Anton Khirnov 33018907bd mp3enc: allow omitting the id3v2 header with -id3v2_version 0 2014-01-17 10:30:45 +01:00
Anton Khirnov f9cc6883a4 mp3enc: add an option for disabling the Xing frame. 2014-01-17 10:30:45 +01:00
Luca Barbato 045654f422 doxy: Document better the available AVFrame flags 2014-01-17 10:00:18 +01:00
Luca Barbato ff23c4e493 doxy: Add AVFrame to the structured modules 2014-01-17 10:00:18 +01:00
Martin Storsjö 87acd33c09 aviocat: Add support for specifying the input duration 
This avoids the caller having to calculate the byte rate if wanting
to push a file in a rate resembling realtime.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-01-17 09:32:09 +02:00
Martin Storsjö 03f2de5856 aviocat: Check the argv array length before reading element i+1 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-01-17 09:31:53 +02:00
Michael Niedermayer 3ca7085ae2 avcodec: make "bitrate tolerance too small for bitrate" error more verbose 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 03:10:42 +01:00
Michael Niedermayer d0004a1959 avcodec/kgv1dec: fix memleak, reintroduce lost decode_flush() call 
fixes regression since 80d44190c4 and 1a0370ad94
this reverts the buggy changes in these 2 commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 02:50:50 +01:00
Michael Niedermayer 2fd39642c9 avcodec/huffyuv: fix median prediction for >8bps 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-16 18:33:17 +01:00
Michael Niedermayer 3d87927959 avcodec/huffyuv: add YUVA{420,422,444}P{9,10} support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-16 17:43:24 +01:00
Michael Niedermayer ef0282125c avcodec/huffyuv: add YUV{420,422,444}P{9,10,12,14} support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-16 17:29:58 +01:00
Michael Niedermayer b53aab1a58 libavcodec/huffyuv: >8 bit support 
This adds only yuv420p10, others are trivial to add after this commit
and will be added in a subsequent commit.
Currently the implementation is not optimized, optimizations will be
added later

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-16 16:59:15 +01:00
Michael Niedermayer 6c004e8aad avcodec/huffyuvenc: init bps from pixel descriptor 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-16 16:24:24 +01:00
Michael Niedermayer 534a89478d avcodec/huffyuv: add a field that represents the number of symbols 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-16 16:24:16 +01:00
Ronald S. Bultje 8173d1ffc0 vp9/x86: 16x16 iadst_idct, idct_iadst and iadst_iadst (ssse3+avx). 
Sample timings on ped1080p.webm (of the ssse3 functions):
iadst_idct:  4672 -> 1175 cycles
idct_iadst:  4736 -> 1263 cycles
iadst_iadst: 4924 -> 1438 cycles
Total decoding time changed from 6.565s to 6.413s.
 2014-01-16 13:49:31 +01:00
Stefano Sabatini a64333db5f lavfi/vidstabtransform: apply various cosmetical nits 2014-01-16 12:35:17 +01:00
Georg Martius 7012a9dc10 configure: add version check for pkg libraries, and use it for vidstab 
Also fix trac ticket #3296.

Signed-off-by: Georg Martius <martius@mis.mpg.de>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-01-16 12:35:04 +01:00
Georg Martius 2727dbb053 lavfi/vidstabdetect,vidstabtransform: update to vid.stab 0.98 
In particular:
* set default value for accuracy to 15 (max)
* add zoomspeed for dynamic zoom (optzoom=2)
* make camera path optimization algorithm configurable
* update optzoom documenation in code to use new localmotions calculation function commandline arguments
* add debug option in vidstabtransform

Signed-off-by: Georg Martius <martius@mis.mpg.de>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-01-16 12:23:48 +01:00
Clément Bœsch 9cc8fa63dd vp9/x86: simplify a few mc inits. 2014-01-16 07:48:27 +01:00