generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
43,906 Commits 24 Branches 241 Tags 173 MiB
e6a045ba56
Commit Graph

43906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini
005af8ce61 examples/muxing: cast sws_scale() argument to the expected one 
Fix warnings:
muxing.c: In function ‘write_video_frame’:
muxing.c:326:23: warning: passing argument 2 of ‘sws_scale’ from incompatible pointer type [enabled by default]
 2012-08-22 01:03:48 +02:00
Stefano Sabatini
4a91962771 doc/eval: add missing documentation of functions 2012-08-22 01:03:48 +02:00
Stefano Sabatini
4a32b30e0c doc/filters: itemize examples for pad filter, and fix a few typos 2012-08-22 01:03:42 +02:00
Diego Biurrun
66baa45801 configure: Drop fastdiv option 
There is no point in having the user disable any fastdiv macros.
Besides the condition implementation was broken and only disabled
the C implementation, but no platform specific assembly versions.
 2012-08-22 01:02:18 +02:00
Diego Biurrun
4264a0dd54 build: Make the E-AC-3 encoder select the AC-3 encoder 
The E-AC-3 encoder depends on almost all of the code of the AC-3
encoder, so it makes no sense to enable one without the other.
 2012-08-22 01:02:17 +02:00
Diego Biurrun
efa4d6adf3 fate: flac: Only run tests requiring samples when samples are available 2012-08-22 00:58:44 +02:00
Piotr Bandurski
bc151aee60 avrn: lowercase "name" and expand"long_name" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-21 22:32:31 +02:00
Justin Greer
e16fda9236 mov: Change default aac priming fallback from 2112 to 1024 
This fixes priming for faac

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-21 22:32:31 +02:00
Justin Greer
37a15f3e66 mov: parse custom "----" Metadata 
This fixes the priming samples for NERO AAC LC

Simplified-by: Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-21 22:31:26 +02:00
Michael Niedermayer
50df56161f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dirac: use meaningful return values
  flacdec: simplify sample buffer handling
  flacdec: simplify loop in decode_residuals()
  fate: make Ut Video encoder tests use bitexact swscale flags
  build: amrwb: Drop redundant lsp dependency declaration
  fate: fix utvideoenc tests

Conflicts:
	libavcodec/dirac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-21 16:17:13 +02:00
Jordi Ortiz
72e8d86b19 dirac: use meaningful return values 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-08-21 15:51:52 +02:00
Clément Bœsch
26ec392a0e lavf: remove unused AVStream pointer. 2012-08-21 13:48:08 +02:00
Clément Bœsch
3dba9e19c8 lavf: add const qualifier to AVCodecDescriptor pointer in is_intra_only(). 
Fix "assignment discards ‘const’ qualifier from pointer target type" warnings.
 2012-08-21 13:47:43 +02:00
Mans Rullgard
44c56a1617 flacdec: simplify sample buffer handling 
Pass pointer to sample buffer instead of channel number to various
functions called from decode_subframe().  Also simplify a few
expressions within this function.
 2012-08-21 11:23:13 +01:00
Mans Rullgard
ea98507db0 flacdec: simplify loop in decode_residuals() 2012-08-21 11:23:13 +01:00
Jan Ekström
2e2d0b1142 fate: make Ut Video encoder tests use bitexact swscale flags 
The failures on various architectures and compilers on the RGB(A)
tests seem to have been because of one-off YCbCr->RGB conversion
results. This should make the conversion results match on most if
not all code paths.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-08-21 11:43:43 +02:00
Stefano Sabatini
10c3329627 doc/ffmpeg: extend documentation for -(no)stdin option 
Fix trac ticket #1665.
 2012-08-21 10:04:30 +02:00
Jan Ekström
957521e7a4 fate: make Ut Video encoder tests use bitexact swscale flags 
The failures on various architectures and compilers on the RGB(A)
tests seem to have been because of one-off YCbCr->RGB conversion
results. This should make the conversion results match on most if
not all code paths.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-08-21 09:45:01 +02:00
Michael Niedermayer
62527dc245 rmdec: parse logical-fileinfo, instead of creating phantom tracks 
Fixes Ticket1090

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-21 06:15:22 +02:00
Michael Niedermayer
19a61bf39d rmdec: pass mime type to ff_rm_read_mdpr_codecdata() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-21 06:14:29 +02:00
Michael Niedermayer
85a576775e lavf: factor ff_free_stream() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-21 06:13:54 +02:00
Michael Niedermayer
3ac754b93b hls: fix min DTS code, try #2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-21 01:52:55 +02:00
Michael Niedermayer
bf606334ad hls: fix EOF check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-21 01:52:55 +02:00
Stefano Sabatini
9a199040d8 lavfi/showspectrum: add priv_class and flags to options 2012-08-21 01:29:25 +02:00
Michael Niedermayer
7123e9506b hls: use av_compare_ts() instead of comparing apples to oranges. 
Fixes Ticket983

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-21 01:00:05 +02:00
Thomas Weber
1c585dddbb lavfi/asyncts: Fix compilation with GCC 4.7 
Compilation failed since commit 42d621d131
Error messages:
libavfilter/af_asyncts.c:249:5: error: initializer element is not
computable at load time
libavfilter/af_asyncts.c:249:5: error: (near initialization for
‘avfilter_af_asyncts.priv_size’)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-21 00:19:13 +02:00
Nicolas George
f4aeb48516 ffmpeg: remove outdated warning. 
-t works with complex filters now.
 2012-08-21 00:03:00 +02:00
Nicolas George
ac45637324 lavf/nutenc: write stream metadata. 2012-08-20 23:54:56 +02:00
Nicolas George
454e37ce0c lavf/nut: define fourcc DVBT for DVB_TELETEXT. 
Allow "-map 0:s -c:s copy" to copy all subtitles streams.
 2012-08-20 23:54:56 +02:00
Nicolas George
dcae2ecc13 ffmpeg: remove useless flags to EOF av_buffersrc_add_ref. 2012-08-20 23:45:15 +02:00
Nicolas George
5bbe4142d1 lavfi/buffersrc: add AV_BUFFERSRC_FLAG_PUSH. 2012-08-20 23:40:16 +02:00
Clément Bœsch
3899e49955 lavfi/edgedetect: use "@see" instead of the invalid "@url". 2012-08-20 23:12:34 +02:00
Clément Bœsch
ddda29b4a7 lavfi: add showspectrum filter. 2012-08-20 23:03:06 +02:00
Michael Niedermayer
786f06e109 h264: fix variable overflow after a few years of video playback 
Found-by: Joakim Plate <elupus@ecce.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 22:30:00 +02:00
rogerdpack
d0b68a9d57 fix spelling 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 21:49:26 +02:00
rogerdpack
415f4cca1d dshow:protect access to curbufsize to promote consistency 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 20:58:05 +02:00
rogerdpack
a966d94891 dshow: avoid integer overflow when using curbufsize 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 20:56:45 +02:00
Derek Buitenhuis
18263698ab utvideoenc: Port to ff_alloc_packet2 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 20:55:19 +02:00
Mans Rullgard
67308bd66b fate: fix utvideoenc tests 
For some reason, the prerequisites have to be specified like this.
Make works in mysterious ways.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-08-20 19:56:08 +02:00
XhmikosR
08bd8c8ab3 rename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 17:47:25 +02:00
Michael Niedermayer
bb3ed3bae6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: Add FATE tests for the Ut Video encoder
  lavc: add Ut Video encoder
  mpegvideo_enc: remove stray duplicate line from 7f9aaa4
  swscale: x86: fix #endif comments in rgb2rgb template file
  avconv: mark more options as expert.
  avconv: split printing "main options" into global and per-file.
  avconv: refactor help printing.

Conflicts:
	Changelog
	ffmpeg_opt.c
	ffserver.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 17:31:55 +02:00
Michael Niedermayer
aee51039ee Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174' 
* commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174':
  avconv: print info/capabilities options in a separate help group.
  avtools: add -h demuxer/muxer
  cmdutils: extend -h to allow printing codec details.

Conflicts:
	cmdutils.h
	ffmpeg_filter.c
	ffmpeg_opt.c
	ffplay.c
	ffserver.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 17:06:50 +02:00
Michael Niedermayer
67a6dac7c1 Merge commit '7c5012127fb7e18f0616011257bb4248f6a8b608' 
* commit '7c5012127fb7e18f0616011257bb4248f6a8b608':
  cmdutils: change semantics of show_help_options() and document it.
  avtools: move some newlines to show_help_options().
  avconv: deprecate -isync.

Conflicts:
	ffmpeg_opt.c
	ffserver.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 16:55:08 +02:00
Michael Niedermayer
c5af068084 Merge commit '8fc83fb081963001e1197c6fdd59fd2af415078a' 
* commit '8fc83fb081963001e1197c6fdd59fd2af415078a':
  avconv: reformat the options table.

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 16:47:12 +02:00
Diego Biurrun
deb23777f2 build: amrwb: Drop redundant lsp dependency declaration 2012-08-20 16:21:48 +02:00
Mans Rullgard
d71e2c1775 fate: fix utvideoenc tests 
For some reason, the prerequisites have to be specified like this.
Make works in mysterious ways.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-08-20 15:07:41 +01:00
Michael Niedermayer
93e75c78dd ffmpeg_opt: get rid of casts for the HAS_ARG case 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 16:05:59 +02:00
Michael Niedermayer
949938d1ca ffmpeg_opt: remove casts for OPT_FUNC2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 16:04:10 +02:00
Michael Niedermayer
581537cfd5 ffmpeg_opt: fix copy_tb 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 16:02:03 +02:00
Michael Niedermayer
927022a753 Merge commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf' 
* commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf':
  avconv: get rid of ugly casts in the options table.
  avconv: try to match codecs by codec descriptor name as a last resort.
  avtools: fix show_foo() signatures.

Conflicts:
	cmdutils.c
	cmdutils.h
	cmdutils_common_opts.h
	ffmpeg_opt.c
	ffplay.c
	ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 15:48:21 +02:00