RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-29 10:52:20 +00:00
Code Issues Projects Releases Wiki Activity
51,481 Commits 37 Branches 400 Tags 246 MiB
39aad43465
Commit Graph

51481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Niedermayer
bd03afb5bb ffmpeg_opt: avoid strcpy() 
This fixes a warning on openbsd and is more robust

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 01:51:19 +01:00
Clément Bœsch
ec1ef0838c tools: add audio normalize script example. 2013-03-26 01:50:13 +01:00
Clément Bœsch
133035c40d lavfi/curves: add forgotten strong_contrast preset. 2013-03-26 01:05:26 +01:00
Clément Bœsch
183f3450fd lavfi/curves: support preset shorthand. 2013-03-26 00:04:06 +01:00
Clément Bœsch
dc65d784df lavfi/curves: add presets support. 
Except for the vintage preset, the values are defined by Lou Logan based
on the ones found in Adobe Photoshop CS6.

Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
 2013-03-25 23:48:51 +01:00
Michael Niedermayer
4a595cff79 ffserver/ctime1: avoid using strcpy() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 23:31:34 +01:00
Michael Niedermayer
ea4c99de4c dshow_pin: dont return a value from a void function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 22:12:07 +01:00
Michael Niedermayer
a2f7314ba2 libpostproc: silence valgrind/fate warning about using uninitialized data 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 21:48:45 +01:00
Kostya Shishkov
613a37eca4 ape: 3.80-3.92 decoding support 2013-03-25 18:40:56 +01:00
Michael Niedermayer
67607e20e8 xxan: make code independent of sizeof(AVFrame) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 17:35:58 +01:00
Michael Niedermayer
8097e5b212 yop: Fix return type 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 15:14:20 +01:00
Martin Storsjö
ccd349e555 h264: Remove an unused variable 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-25 15:00:05 +02:00
Michael Niedermayer
afdfff485b avcodec/gifdec: Add av_log() to workaround gcc 4.2 miscompiling the code 
It appears gcc forgets to increment the byte stream pointer at -O3
I was not able to spot a reason/excuse for it to do that. It
also disappears if the function isnt inlined.

This should fix the gif fate failures on open & free bsd

See: [FFmpeg-devel] [PATCH] gifdec: workaround old gcc 4.2 mis-compiling code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 13:32:45 +01:00
Michael Niedermayer
ad438f450b xan: make decoder independent of sizeof(AVFrame) 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 13:30:30 +01:00
James Almer
45013b365e lavc/flacdec: Propagate and return meaningful error codes 
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 13:16:33 +01:00
Björn S
f248b8a902 blend: Adding yuvj pixelformats to the blend effect 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 13:14:38 +01:00
Michael Niedermayer
4ce9e4e9c9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  sndio_dec: Add missing includes for av_gettime()

no change, as this has already been fixed in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 12:20:44 +01:00
Janne Grunau
e5c2794a71 x86: consistently use unaligned movs in the unaligned bswap 
Fixes fate errors in asv1, ffvhuff and huffyuv on x86_32.
 2013-03-25 12:11:11 +01:00
Michael Niedermayer
ae65327e5e vsrc_testsrc: avoid floats and non bit exactness 
The round to zero behavior is maintained, possibly this should
be changed to round to nearest.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 03:11:43 +01:00
Michael Niedermayer
01df2a13c3 avcodec/utils: initialize pixel buffer pool 
This should silence many valgrind warnings about use of uninitialized
data, all the warnings i looked at where false positives having their
uninitialized data not actually used.

The same effect could be achieved by listing all code that touches
the pixel buffer in the valgrind suppression file.
Note, valgrind also fails to trace the origins correctly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 00:43:14 +01:00
Nicolas George
4f112a8e34 lavf/mux: add the flush_packets option. 
Note: a lot of muxers already do the flushing explicitly.
 2013-03-24 23:19:07 +01:00
Nicolas George
125acd2152 lavfi: support multiple rounds of format negotiation. 
Remove the temporary hack for amerge and replace it with a
generic solution.
 2013-03-24 23:17:47 +01:00
Nicolas George
00da527b44 lavfi/af_amerge: return EAGAIN if the input layouts are not known. 
Also downgrade the error to a warning.
 2013-03-24 23:17:47 +01:00
Nicolas George
57cb4fb075 lavfi: add test for concat. 2013-03-24 23:16:40 +01:00