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

44015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wolfram Gloger
a5a0dedf11 Fix duplicate packet init introduced by 7f9aaa4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 14:45:28 +02:00
Jan Ekström
b96509c93c fate: Add FATE tests for the Ut Video encoder 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-08-20 11:23:10 +02:00
Jan Ekström
1ab5a78042 lavc: add Ut Video encoder 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-08-20 11:22:59 +02:00
Anton Khirnov
677e763a55 mpegvideo_enc: remove stray duplicate line from 7f9aaa4 2012-08-20 10:05:49 +02:00
Michael Niedermayer
76c3fff2f3 h264: Workaround invalid MPEG-TS broadcasts 
Fixes seeking to the first keyframe
Fixes Ticket1029

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 05:47:42 +02:00
Michael Niedermayer
9e5f79ed8a avrndec: add DR1 capability flag 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 03:31:41 +02:00
Michael Niedermayer
b1acf5d7a6 AVRn: fix progressive 
Fixes Ticket970

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 02:50:59 +02:00
Michael Niedermayer
ba2cf854d0 lavc: move AVRn to a seperate decoder. 
The special cases in demuxers and decoders are a mess otherwise (and more
would be needed to support it fully)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 02:46:09 +02:00
Giorgio Vazzana
1e6072139b swscale: x86: fix #endif comments in rgb2rgb template file 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-08-19 21:50:09 +02:00
Anton Khirnov
602b1898e5 avconv: mark more options as expert. 2012-08-19 19:26:20 +02:00
Anton Khirnov
f9fada2704 avconv: split printing "main options" into global and per-file. 2012-08-19 19:23:43 +02:00
Anton Khirnov
6e3857fa8c avconv: refactor help printing. 
By default don't dump every single option on the user, but print only
the basic options.

Add -h long/full to print more options.
 2012-08-19 19:23:17 +02:00
Anton Khirnov
f8b1e66553 avconv: print info/capabilities options in a separate help group. 2012-08-19 19:23:06 +02:00
Anton Khirnov
1136bd362a avtools: add -h demuxer/muxer 2012-08-19 19:22:41 +02:00
Anton Khirnov
a3ad68d36c cmdutils: extend -h to allow printing codec details. 2012-08-19 19:22:08 +02:00
Anton Khirnov
7c5012127f cmdutils: change semantics of show_help_options() and document it. 
Currently it takes a mask and value, such that options for which
(flags & mask) == value.

Change it to take required flags and forbidden flags instead. This is
shorter and simpler to understand.
 2012-08-19 19:21:35 +02:00
Anton Khirnov
dc4c24a3d3 avtools: move some newlines to show_help_options(). 
Don't require every caller to supply them.
 2012-08-19 19:21:03 +02:00
Anton Khirnov
79600a8354 avconv: deprecate -isync. 
This option does not do anything.

Also remove OPT_GRAB, since -isync is the last option using it.
 2012-08-19 19:20:14 +02:00
Anton Khirnov
8fc83fb081 avconv: reformat the options table. 2012-08-19 19:15:51 +02:00
Anton Khirnov
d3810c47fe avconv: get rid of ugly casts in the options table. 2012-08-19 19:09:36 +02:00
Anton Khirnov
db4766ad1b avconv: try to match codecs by codec descriptor name as a last resort. 
This allows e.g. -c:v h264 to select the libx264 encoder.
 2012-08-19 19:08:48 +02:00
Anton Khirnov
f617135bc9 avtools: fix show_foo() signatures. 
show_foo() functions are declared as void show_foo(void), but called as
int show_foo(const char*, const char*).
 2012-08-19 19:07:43 +02:00
rogerdpack
a93c221ccd dshow: protect access to curbufsize 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-19 18:36:26 +02:00
rogerdpack
42dbf06df0 dshow: cleanup reference 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-19 18:30:50 +02:00
Nicolas George
c28d80f4c9 lavc: avcodec_get_name: return "none" for AV_CODEC_ID_NONE. 2012-08-19 15:26:05 +02:00
Michael Niedermayer
c9fe864472 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vorbisdec: remove some pointless comments
  avprobe: add const to AVCodec pointer
  libavformat: add const to AVCodec pointers
  pthread: add const to AVCodec pointers

Conflicts:
	ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-19 14:55:58 +02:00
Mans Rullgard
4855022aa1 vorbisdec: remove some pointless comments 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-08-19 12:59:58 +01:00
Nicolas George
5980e57cf9 lavfi: add volumedetect filter. 2012-08-19 11:37:05 +02:00
Nicolas George
13b965ead4 ffmpeg: reindent after last commit. 2012-08-19 11:23:59 +02:00
Nicolas George
429c6cab1c ffmpeg: reduce differences with avconv for in/out scheduling. 
Rework the transcode() function and its immediate annexes to have
the same structure as in avconv, while still maintaining proper
scheduling to avoid accumulation.

Using -filter_complex without inputs now works.
 2012-08-19 11:20:56 +02:00
Michael Niedermayer
af5086087e ffmpeg: Clip invalid video timestamps like audio instead of failing hard. 
Fixes Ticket976

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-19 02:42:53 +02:00
Michael Niedermayer
0de4918f32 rawdec: support AVRn 1:1 raw interlaced mode 
Fixes Ticket971

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-18 23:55:59 +02:00
Stefano Sabatini
e35c0ee05c lavf/segment: fix computation of M3U8 segment target duration 
Use ceil on the max duration, rather than approximating it to the nearest
integer.
 2012-08-18 22:46:12 +02:00
Michael Niedermayer
a21f65b55e elbg: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-18 21:54:52 +02:00
Michael Niedermayer
9018f8c328 elbg: fix assert 
It seems the condition was flipped from what was intended

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-18 21:53:32 +02:00
Michael Niedermayer
28ff17fa97 lavf: add use_wallclock_as_timestamps 
This may fix Ticket730

Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-18 19:19:47 +02:00
Nicolas George
92b8c9d89e lavf/au: check bits per coded sample. 
Without that, it would repeatedly produce empty packets
if the codec if forced to something invalid.

Fix trac ticket #1652.
 2012-08-18 17:45:58 +02:00
Michael Niedermayer
7f46f042d1 buildsys: fix cleaning of libmpcodecs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-18 16:36:16 +02:00
Uoti Urpala
e70730045a h264: vdpau: fix crash with unsupported colorspace 
The h264_vdpau decoder crashed if output colorspace was not 8-bit 420.
Add a check to error out instead (current hardware does not support
other colorspaces, so successful decoding is not possible).

Check implemented at a different place by michael, thus blame for bugs goes to michael
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-18 16:36:09 +02:00
Mans Rullgard
8b13445791 avprobe: add const to AVCodec pointer 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-08-18 14:20:57 +01:00
Mans Rullgard
edb5238ccb libavformat: add const to AVCodec pointers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-08-18 14:20:57 +01:00