ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-24 23:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,355 Commits 37 Branches 398 Tags 539 MiB
a56d963f11
Commit Graph

51355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
a56d963f11 vp3: Check fps validity more completely 
Fix assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 00:56:12 +01:00
Michael Niedermayer
c6831e2a70 wavpack: check K, fix assertion failure 
Instead of this it would be possible to change the code to support
larger K but that would make the code slower and probably still need
checks on K.
This variant is choosen as there are no known valid files that need
larger K

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 00:54:45 +01:00
Dale Curtis
81e85bc95c Fix heap-buffer-overflow in matroska_parse_block 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-27 23:51:44 +01:00
Michael Niedermayer
e9d3b40052 snow: drop commented out asserts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-27 23:06:29 +01:00
Michael Niedermayer
460d30406b avformat: change some seeking related assert to av_asserts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-27 22:53:57 +01:00
Michael Niedermayer
0d6e5a1712 vsrc_mandelbrot: Mandel morphing support 
Example: ffplay -f lavfi "mandelbrot=outer=outz:morphamp=1:end_scale=2:maxiter=100"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-27 19:27:37 +01:00
Michael Niedermayer
79938a4e97 mandelbrot: add outer coloring method showing bailouted z 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-27 16:21:44 +01:00
Michael Niedermayer
a2b5825649 vsrc_mandelbrot: support coloring the outside white 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-27 16:00:18 +01:00
Michael Niedermayer
ace0cfea60 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  hwaccel: fix use with frame based multithreading

Conflicts:
	libavcodec/h263dec.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-27 11:51:33 +01:00
Michael Niedermayer
12f203a098 Merge commit 'c24469e812501903a46a06eff9722a82e136e841' 
* commit 'c24469e812501903a46a06eff9722a82e136e841':
  utils: add workaround for AVHWAccel in ff_get_buffer compat code
  configure: Remove a stray msmpeg4v1 encoder declaration

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-27 11:42:15 +01:00
Michael Niedermayer
ef8ab2f953 Merge commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d' 
* commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d':
  configure: Remove the mpegvideo dependency from svq1
  x86: vc1dsp: Fix indentation

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-27 11:32:45 +01:00
d s
914f48ddf0 Update MAINTAINERS with information about avisynth demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-27 03:47:56 +01:00
d s
444001bda6 Fix avisynth_context_create constructor error handling. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-27 03:47:49 +01:00
Carl Eugen Hoyos
92a9a3020d Support pcm_mulaw in Hikvision CCTV mpeg program streams. 
Fixes decoding the sample from videolan trac ticket #8344.
 2013-03-27 02:32:26 +01:00
Carl Eugen Hoyos
7857ddceec Fix a typo in the Monkey's Audio demuxer. 2013-03-27 01:55:11 +01:00
Clément Bœsch
1a3f7ded14 doc: "av* tools" -> "ff* tools". 
Spotted-by: Timothy Gu <timothygu99@gmail.com>
 2013-03-27 01:44:20 +01:00
Michael Niedermayer
e370b65897 tests/tiny_ssim: include the 2 macros instead of a header 
Should fix compilation on open solaris

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-27 01:38:18 +01:00
Michael Niedermayer
46c48d546d mpegvideo: fix null pointer dereference on switching streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 21:54:36 +01:00
Janne Grunau
05fa79b844 hwaccel: fix use with frame based multithreading 
Allows use of AVHWAccel based decoders with frame based multithreading.
The decoders will be forced into an non-concurrent mode by delaying
ff_thread_finish_setup() calls after decoding of the current frame
is finished.

This wastes memory by unnecessarily using multiple threads and thus
copies of the decoder context but allows seamless switching between
hardware accelerated and frame threaded software decoding when the
hardware decoder does not support the stream.
 2013-03-26 19:44:50 +01:00
Janne Grunau
c24469e812 utils: add workaround for AVHWAccel in ff_get_buffer compat code 
Since c977039e58 plane count for
PIX_FMT_HWACCEL pixel formats is 0 instead of 1. The created dummy
AVBuffers are still bogus since AVFrame does not hold frame data when
AVHWAccels are used.
 2013-03-26 19:44:50 +01:00
Michael Niedermayer
7b3ca7ae8b mpegvideo/h264: drop period_since_free 
This should not be needed anymore

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 19:27:32 +01:00
Michael Niedermayer
4c587b4f30 tiny_ssim: Avoid "for(int ..." 
This should avoid issues with old compilers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 19:26:44 +01:00
Loren Merritt
064146480b tools: add tiny_ssim 
Taken from:
http://lists.mplayerhq.hu/pipermail/mencoder-users/2006-August/003801.html
and
x264
See: [FFmpeg-devel] [PATCH] tools: add tiny_ssim

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 17:31:41 +01:00
Martin Storsjö
2ece5bf3ec configure: Remove a stray msmpeg4v1 encoder declaration 
No such encoder exists currently.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-26 16:17:00 +02:00
Carl Eugen Hoyos
1741fece70 Only test the first frame for missing aac_adtstoasc bistream filter. 
Many players ignore broken aac frames, so don't abort mov or flv
muxing when encountering one, just print a warning instead.

Fixes ticket #2380.
 2013-03-26 15:16:07 +01:00
Carl Eugen Hoyos
8af593dd80 mpegtsenc: Only test the first frame for missing h264_mp4toannexb filter. 
Many video players accept broken frames in a transport stream, so there
is no reason to abort remuxing when encountering one, just print a
warning instead.

Fixes ticket #1758.
 2013-03-26 15:15:46 +01:00
Martin Storsjö
3b2d0ec473 configure: Remove the mpegvideo dependency from svq1 
The svq1 decoder can be built standalone without mpegvideo.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-26 15:50:00 +02:00
Martin Storsjö
a2acadd058 x86: vc1dsp: Fix indentation 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-26 15:49:42 +02:00
Michael Niedermayer
07d405cc9e configure: mpegvideo should not depend on error resilience 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 14:43:12 +01:00
Michael Niedermayer
79c845659a configure: the snow encoder is not supposed to depend on error resilience 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 14:41:55 +01:00
Michael Niedermayer
365ad0042a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: Make it possible to compile without error_resilience

Conflicts:
	configure
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 14:36:00 +01:00
Paul B Mahol
62d36abef4 lavfi/mptestsrc: make use of AV_OPT_TYPE_VIDEO_RATE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-26 13:23:42 +00:00
Paul B Mahol
401f9c95e9 lavfi/cellauto: make use of AV_OPT_TYPE_VIDEO_RATE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-26 13:23:42 +00:00
Paul B Mahol
8c5b37b402 lavfi/life: make use of AV_OPT_TYPE_VIDEO_RATE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-26 13:23:42 +00:00
Paul B Mahol
975efc8864 lavfi/mandelbrot: make use of AV_OPT_TYPE_VIDEO_RATE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-26 13:23:42 +00:00
Paul B Mahol
54056c6655 lavfi/testsrc: make use of AV_OPT_TYPE_VIDEO_RATE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-26 13:23:41 +00:00
Paul B Mahol
7606f4a1af lavfi/fps: make use of AV_OPT_TYPE_VIDEO_RATE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-26 13:23:41 +00:00
Michael Niedermayer
b19604cc4b Merge commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0' 
* commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0':
  lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideo

Conflicts:
	libavcodec/h264_parser.c
	libavcodec/internal.h
	libavcodec/mpeg12.c
	libavcodec/utils.c
	libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 13:44:09 +01:00
Michael Niedermayer
7834bb092a Revert "Fix compilation with --disable-everything --enable-parser=h264." 
This reverts commit e0e8c20559.

The mpegvideo dependancy should not be needed anymore
 2013-03-26 13:23:01 +01:00
Michael Niedermayer
2cdedcbcea Merge commit '75644335b907919057960716508477239c26fed4' 
* commit '75644335b907919057960716508477239c26fed4':
  lavc: Move start code finding to utils.c

Conflicts:
	configure
	libavcodec/mpegvideo.c
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 13:22:48 +01:00
Michael Niedermayer
795b911bd8 Merge commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f' 
* commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f':
  ape: 3.80-3.92 decoding support
  h264: Remove an unused variable

Conflicts:
	libavcodec/apedec.c
	libavformat/ape.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 13:14:16 +01:00
Michael Niedermayer
9b9205e760 x86/dsputil.asm: make unaligned bswap actually work 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 13:07:46 +01:00
Michael Niedermayer
cb69a9dbf4 Merge commit 'e5c2794a7162e485eefd3133af5b98fd31386aeb' 
* commit 'e5c2794a7162e485eefd3133af5b98fd31386aeb':
  x86: consistently use unaligned movs in the unaligned bswap

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 13:07:37 +01:00
Ronald S. Bultje
0b499c9b06 h264: Make it possible to compile without error_resilience 
Error resilience is enabled by the h264 decoder, unless explicitly
disabled. --disable-everything --enable-decoder=h264 will produce
a h264 decoder with error resilience enabled, while
--disable-everything --enable-decoder=h264 --disable-error-resilience
will produce a h264 decoder with error resilience disabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-26 09:55:05 +02:00
Martin Storsjö
f1e9398621 lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideo 
Also move the declaration to internal.h, and add restrict qualifiers
to the declaration (as in the implementation).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-26 09:50:02 +02:00
Martin Storsjö
75644335b9 lavc: Move start code finding to utils.c 
This allows dropping the mpegvideo dependency from a number of
components.

This also fixes standalone building of the h264 parser, which
was broken in 64e438697.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-26 09:48:12 +02:00
Michael Niedermayer
ea7b96af96 avcodec/x86/dsputil_qns_template: use av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 04:08:28 +01:00
Clément Bœsch
e32cbd0f54 lavfi/perms: add myself to the copyright header. 2013-03-26 02:41:05 +01:00
Clément Bœsch
9371467d9d lavfi/perms: add seed option. 2013-03-26 02:39:55 +01:00
Clément Bœsch
e600d0628e lavfi/perms: remove unecessary indirection after f7324c06. 2013-03-26 02:24:03 +01:00