eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
68717 commits 37 branches 405 tags 511 MiB
Commit graph

169 commits

Author SHA1 Message Date
Michael Niedermayer
3e641b4842 Merge commit '7671dd7cd7' 
* commit '7671dd7cd7':
  avconv: add support for VDPAU decoding

Conflicts:
	Changelog
	Makefile
	configure
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-23 14:46:48 +01:00
Michael Niedermayer
62e10c3759 Merge commit '07fd0a2219' 
* commit '07fd0a2219':
  avconv: add infrastructure for using hwaccels

Conflicts:
	ffmpeg.c
	ffmpeg.h
	ffmpeg_filter.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-23 14:31:15 +01:00
Michael Niedermayer
d7ebeba80c ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it. 
Fixes different behavior to JM and probably several if not all
reference decoders.

We cannot just do this unconditionally as it would ruin AV sync in
some use cases.

Bug-Found-by: BugMaster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-16 14:27:29 +01:00
Michael Niedermayer
9647c6dedd ffmpeg_opt: fix overriding values set by -target 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-13 22:07:19 +01:00
Stefano Sabatini
f591ba60ff ffmpeg: generate more specific error message in case of inconsistent filtering options 
In particular, distinguish if the option was -filter or -filter_script.

Suggested-by: Nicolas George
 2013-11-09 19:05:35 +01:00
Stefano Sabatini
0f8bdfe3e8 ffmpeg: store value of -filter and -filter_script per-stream option in OutputStream struct 
Avoid the need for multiple potentially inconsistent access operations,
slightly factorize code.
 2013-11-09 19:05:34 +01:00
Stefano Sabatini
535d58959d ffmpeg: add verbose consistency checks in case of filtering inconsistent options 
In particular, warn in case -filter and streamcopy is used at the same
time, fix trac ticket #678.
 2013-11-03 18:05:43 +01:00
Paul B Mahol
c655216939 make it possible to compile ffmpeg without swscale 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-21 13:57:00 +00:00
Michael Niedermayer
b6b9c150f0 ffmpeg: add max_error_rate to allow tuning the point decoding errors are considered a failure of the whole transcoding. 
Suggested-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-07 23:58:59 +02:00
Michael Niedermayer
4d5d905eed ffmpeg: avoid direct access to lowres use av_codec_g/set_lowres() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-03 17:20:53 +02:00
Michael Niedermayer
64327aabb9 ffmpeg: add support to force specific AVCodecs 
previously only codec_ids could be forced, which did not allow
forcing a specific implementation like libopenjpeg vs jpeg2000.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 22:56:03 +02:00
Michael Niedermayer
b7fc2693c7 Merge commit '488a0fa689' 
* commit '488a0fa689':
  avconv: support -t as an input option.

Conflicts:
	Changelog
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 12:41:04 +02:00
Michael Niedermayer
6d77279ed8 ffmpeg_opt: Remove support for specifying -t anywhere to set the duration 
This would otherwise conflict with the semantics of using -t for the input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 12:06:28 +02:00
Michael Niedermayer
7cbef2ed7e Merge commit '811bd07846' 
* commit '811bd07846':
  avconv: make input -ss accurate when transcoding

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg.h
	ffmpeg_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 11:39:09 +02:00
Michael Niedermayer
3fa72de82f Merge commit '56ee3f9de7' 
* commit '56ee3f9de7':
  avconv: distinguish between -ss 0 and -ss not being used

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 10:25:32 +02:00
Michael Niedermayer
4f07fcd30b Merge commit '7748dd41be' 
* commit '7748dd41be':
  avconv: add -n option to immediately exit when output files already exist

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg_opt.c

See: 0a4f02117b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 13:21:34 +02:00
Michael Niedermayer
d0a7933991 ffmpeg_opt: do not warn about unused gop_timecode 
The option is injected by generic code and being sometimes unused is normal.

Fixes Ticket2762

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 10:54:40 +02:00
Michael Niedermayer
d1e8d4b055 ffmpeg: Allow overriding ffservers input 
Fixes Ticket1970

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 01:50:32 +02:00
Michael Niedermayer
d7fbe926d3 ffmpeg: move creation_time for ffserver setting up 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 01:50:32 +02:00
Michael Niedermayer
eeddeb6579 ffmpeg_opt: replace exit() by exit_program() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 11:12:32 +02:00
Michael Niedermayer
33ff943f70 ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 23:55:06 +02:00
Nicolas George
449704b475 ffmpeg: move a local variable definition later. 
Fix a segfault when using the -map option without input files.
 2013-05-07 18:39:45 +02:00
Michael Niedermayer
2b7f595aca Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: do not send non-monotonous DTS to the muxers.

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 14:52:03 +02:00
Michael Niedermayer
1924a61a0a Merge commit '3d62442008' 
* commit '3d62442008':
  avconv_opt: allocate an OutputFile before the streams.

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 12:09:07 +02:00
Nicolas George
b1cc12d0e3 ffmpeg: make -aspect work with -vcodec copy. 2013-04-18 22:59:54 +02:00
Michael Niedermayer
f81a8e89a1 Merge commit 'dc574658d1' 
* commit 'dc574658d1':
  avconv: print filter options in -h full output.

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 15:33:37 +02:00
Michael Niedermayer
231fd4411f Merge commit '38f0c0781a' 
* commit '38f0c0781a':
  lavfi: merge avfiltergraph.h into avfilter.h

Conflicts:
	doc/APIchanges
	ffmpeg_filter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.h
	libavfilter/version.h
	tools/graph2dot.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 23:50:39 +02:00
Nicolas George
de38e7c8c3 ffmpeg: use a rational for -aspect option. 2013-04-09 20:16:20 +02:00
Michael Niedermayer
4bcb75cc48 ffmpeg: Print a warning when -frames is affecting non video frames 
Fixes Ticket2395

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-07 22:13:58 +02:00
Michael Niedermayer
ac1a1fd708 Merge commit '1ae44c87c9' 
* commit '1ae44c87c9':
  lavfi/gradfun: remove rounding to match C and SSE code.
  lavfi/gradfun: fix dithering in MMX code.
  lavfi/gradfun: fix rounding in MMX code.
  lavfi/gradfun: do not increment DC pointer for odd values.
  fate: filter: Add dependencies
  avconv: add options for reading filtergraphs from a file.

Conflicts:
	Changelog
	doc/ffmpeg.texi
	doc/filters.texi
	ffmpeg.h
	ffmpeg_opt.c
	libavfilter/vf_gradfun.c
	tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 13:00:39 +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
Michael Niedermayer
4257b804e2 ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with yadif injection 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 13:54:04 +01:00
Nicolas George
40ea006b76 ffmpeg: make -lavfi an alias for -filter_complex. 2013-03-17 16:24:43 +01:00
Nicolas George
639a9e21a6 ffmpeg_opt: add OPT_INPUT to -fix_sub_duration and -canvas_size. 2013-03-16 17:20:19 +01:00
Michael Niedermayer
9df00574fc Merge commit '3e175a2a55' 
* commit '3e175a2a55':
  avconv: mark attachment streams as immediately finished
  vaapi: fix argument for ff_vaapi_common_end_frame call

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-15 12:54:05 +01:00
Nicolas George
0eb56a085d ffmpeg: add OPT_INPUT to -guess_layout_max. 2013-03-14 19:32:22 +01:00
Nicolas George
da397173df ffmpeg: add OPT_OUTPUT to -to option. 
Fix trac ticket #2355.
 2013-03-14 19:32:22 +01:00
Michael Niedermayer
d64b854075 Merge commit '666fe5da47' 
* commit '666fe5da47':
  atomic: Exclude the unsupported implementation headers from checkheaders
  avconv: do not silently ignore unused codec AVOptions.

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 21:34:24 +01:00
Michael Niedermayer
771919e11f Merge commit '6deae8e053' 
* commit '6deae8e053':
  FATE: remove the -dct option from some decoding tests.
  avconv: use a local variable for InputFile in open_input_file().

Conflicts:
	tests/fate/microsoft.mak
	tests/fate/real.mak
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 21:06:30 +01:00
Michael Niedermayer
49e87819d0 Merge commit '1da54e908e' 
* commit '1da54e908e':
  avconv: use a local variable for OutputFile in open_output_file().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 20:58:56 +01:00
Michael Niedermayer
bd93f3c5bd ffmpeg: fix reinit_filter type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 18:24:48 +01:00
Michael Niedermayer
5743095ca9 Merge commit '9d3009c6c4' 
* commit '9d3009c6c4':
  avconv: print an error on applying options of the wrong type.
  atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
  output-example: Update to use encode_video2 instead of the now dropped encode_video

Conflicts:
	doc/examples/muxing.c
	ffmpeg_opt.c
	libavutil/atomic.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 18:10:35 +01:00
Nicolas George
cb2bd91413 ffmpeg: add the -canvas_size option. 
Allows, amongst other things, to override the size guessed
by the sub2video hack.

Note: the -s option could have more or less the same semantic,
but it receives a special treatment by the options system.
 2013-03-10 13:48:49 +01:00
Michael Niedermayer
e2427f04b7 ffmpeg_opt: Ask for overwrite in single image2 files too 
Fixes Ticket1637

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 22:09:01 +01:00
Ronald S. Bultje
2cffe38df3 Deprecate deinterlaced in libavcodec. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 21:11:48 +01:00
Michael Niedermayer
9af8179cdb ffmpeg: fix -stats -v 0 
Fixes Ticket1687

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 19:38:13 +01:00
Michael Niedermayer
41401773d3 Merge commit 'df0229a7ca' 
* commit 'df0229a7ca':
  avconv: Apply codec options to streams that are copied as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 12:57:17 +01:00
Jean First
2d7044683f ffmpeg_opt: add -to option to specify stop time 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-27 02:17:42 +01:00
Jean First
af0e8144cd ffmpeg_opt: cosmetics 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 18:36:21 +01:00
Michael Niedermayer
ad899522ff ffmpeg: use a AVDictionary instead of the context to move swr parameters around 
This avoids per parameter changes in ffmpeg at the cost of making access
somewhat more annoying.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 20:31:56 +01:00