har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,452 Commits 2 Branches 401 Tags
Commit Graph

216 Commits

Author SHA1 Message Date
Michael Niedermayer
ae2cb9290a ffmpeg_opt: Prefer audio streams with packets 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-14 10:43:16 +02:00
Michael Niedermayer
6dbaeed6b7 ffmpeg: switch swscale option handling to AVDictionary similar to what the other subsystems use 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 14:44:15 +02:00
Sebastien Zwickert
11d923d414 avcodec: add new Videotoolbox hwaccel. 2015-08-03 10:12:10 +02:00
Michael Niedermayer
0949869e7b ffmpeg_op: Print warning if duration isnt known when -sseof is used 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-29 18:58:57 +02:00
Michael Niedermayer
f4ada6dc3f ffmpeg: Implement support for seeking relative to EOF 
Fixes Ticket227

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-29 17:16:51 +02:00
Michael Niedermayer
94d68a41fa Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615':
  lavc: AV-prefix all codec flags

Conflicts:
	doc/examples/muxing.c
	ffmpeg.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/aacdec.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.c
	libavcodec/ac3enc_float.c
	libavcodec/atrac1.c
	libavcodec/atrac3.c
	libavcodec/atrac3plusdec.c
	libavcodec/dcadec.c
	libavcodec/ffv1enc.c
	libavcodec/h264.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_mb.c
	libavcodec/imc.c
	libavcodec/libmp3lame.c
	libavcodec/libtheoraenc.c
	libavcodec/libtwolame.c
	libavcodec/libvpxenc.c
	libavcodec/libxavs.c
	libavcodec/libxvid.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegaudiodec_template.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/nellymoserdec.c
	libavcodec/nellymoserenc.c
	libavcodec/nvenc.c
	libavcodec/on2avc.c
	libavcodec/options_table.h
	libavcodec/opus_celt.c
	libavcodec/pngenc.c
	libavcodec/ra288.c
	libavcodec/ratecontrol.c
	libavcodec/twinvq.c
	libavcodec/vc1_block.c
	libavcodec/vc1_loopfilter.c
	libavcodec/vc1_mc.c
	libavcodec/vc1dec.c
	libavcodec/vorbisdec.c
	libavcodec/vp3.c
	libavcodec/wma.c
	libavcodec/wmaprodec.c
	libavcodec/x86/hpeldsp_init.c
	libavcodec/x86/me_cmp_init.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 22:10:35 +02:00
Michael Niedermayer
bc3f19641c Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c' 
* commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c':
  avconv: split creating and (re-)configuring complex filtergraphs

Conflicts:
	ffmpeg_filter.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 15:36:54 +02:00
Michael Niedermayer
c7dd2365f4 Merge commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727' 
* commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727':
  avconv: create the complex filtergraphs earlier

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 14:12:11 +02:00
Michael Niedermayer
3b0534efdc Merge commit '1959351aecf09fc3e90208ff775f4849801dc13f' 
* commit '1959351aecf09fc3e90208ff775f4849801dc13f':
  avconv: move the no streams failure to open_output_file()

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 14:01:45 +02:00
Michael Niedermayer
edd110ee45 Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e' 
* commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e':
  avconv: use read_file() for reading the 2pass stats

Conflicts:
	cmdutils.c
	cmdutils.h
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 13:33:44 +02:00
Michael Niedermayer
247f4d1f18 Merge commit '6d5d9246042acb804a652e6fedfb7afe0ca85614' 
* commit '6d5d9246042acb804a652e6fedfb7afe0ca85614':
  avconv: move handling the 2pass logfile into avconv_opt

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 12:59:05 +02:00
Michael Niedermayer
db3e12a828 Merge commit '59245e0c5e10a849e67c632cccf4f677b2442e82' 
* commit '59245e0c5e10a849e67c632cccf4f677b2442e82':
  avconv: set the encoding/decoding_needed flags earlier

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 12:44:07 +02:00
Michael Niedermayer
843be56ee1 ffmpeg_opt: Fix stream copy flag for attachments 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 12:43:36 +02:00
Rodger Combs
2375a85c36 ffmpeg_opt: allow the user to ignore unused stream maps 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-06 15:40:13 +02:00
Michael Niedermayer
52c5521877 ffmpeg_opt: Favor streams that had packets 
Fixes Thailand-Wave.wmv without explicitly specifying a stream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 22:43:26 +02:00
Michael Niedermayer
8750aef3d6 ffmpeg_opt: Fix forcing fourccs 
Fixes Ticket4682

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 05:10:51 +02:00
Michael Niedermayer
29cc0a178e ffmpeg_opt: Fix sync_ist 
This code was lost in 2663540821ee010edc7a47316b00a4745aaf973c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-26 12:41:43 +02:00
Michael Niedermayer
54649cbda8 ffmpeg_opt: Fix handling of creation_time now 
Fixes Ticket4495

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-21 04:57:20 +02:00
Michael Niedermayer
6cfaa51acb Merge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6' 
* commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6':
  avconv_opt: Check localtime() return value

Conflicts:
	ffmpeg_opt.c

See: 8e91d9652ea5048d9014e7636e12c6ed4732d7b7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 22:38:44 +02:00
Michael Niedermayer
8e91d9652e ffmpeg_opt: Check for localtime() failure 
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 15:36:20 +02:00
Michael Niedermayer
2ce6e41911 ffmpeg_opt: Set the video VBV parameters only for the video stream from -target 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-25 12:13:53 +02:00
Michael Niedermayer
18833daf9d ffmpeg: Support copying unknown streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 18:21:38 +02:00
Michael Niedermayer
0b9d636877 ffmpeg_opt: add missing space in error message 
Found-by: rcombs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 01:47:50 +02:00
Michael Niedermayer
592b053c7b ffmpeg_opt: fix the error message log level for the unsupported stream types 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 01:10:53 +02:00
Michael Niedermayer
100df10b0f ffmpeg_opt: Give the user a hint on how to ignore unsupported streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 01:10:53 +02:00
Rodger Combs
a2aff2690b ffmpeg: support ignoring unsupported mapped streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 00:52:06 +02:00
Michael Niedermayer
b0322e4a9e ffmpeg_opt: Compensate for DTS/PTS difference in seeking when its based on DTS 
Fixes Ticket4554

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-18 21:16:36 +02:00
Michael Niedermayer
57e38043de ffmpeg: Do not copy the display matrix if rotation meta-data is manually added 
Fixes Ticket4560

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-18 00:52:36 +02:00
Michael Niedermayer
107e4da476 ffmpeg_opt: Fix -timestamp parsing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-09 13:07:00 +02:00
Michael Niedermayer
a1acae0409 ffmpeg_opt: remove rotate metadata in case of autorotate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-02 23:04:00 +02:00
Michael Niedermayer
f5b26fbc2f Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2' 
* commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2':
  avconv: Add an option for automatically rotating video according to display matrix

Conflicts:
	Changelog
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-02 22:39:00 +02:00
wm4
bac7084fbd ffmpeg: add option not to offset seek position by start time 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 19:50:58 +02:00
Michael Niedermayer
959894632a Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035' 
* commit '3892bdab9b652eb003ab95e167f1765e0b0ea035':
  avconv: do not overwrite the stream codec context for streamcopy

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-04 00:38:02 +02:00
Tim Nicholson
27565ace60 ffmpeg_opt.c: fix regression introduced in 5743095c 
-vtag is an input and output option.

Signed-off-by: Tim Nicholson <tim.nicholson@bbc.co.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-02 20:04:00 +02:00
Michael Niedermayer
6a3833e141 ffmpeg_opt: Do not overwrite output if there is no input 
Fixes Ticket4254

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 23:00:07 +01:00
Nicolas George
508d6a23b4 ffmpeg: allow to set the thread message queue size. 2015-02-26 19:19:56 +01:00
Michael Niedermayer
80d278a981 ffmpeg_opt: Add missing MATCH_PER_TYPE_OPT() for data codecs 
Fixes: CID1270809

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 22:13:35 +01:00
Michael Niedermayer
15cd2a93e7 Merge commit '81688e68f93f3142e2093f1a3d226edaeb179992' 
* commit '81688e68f93f3142e2093f1a3d226edaeb179992':
  avconv: Check rc_override memory allocation

Conflicts:
	ffmpeg_opt.c

See: 7efabffc2899b76688a40b4bd7c63370eb2d8ca8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:00:04 +01:00
Anshul Maheshwari
bbb0634585 ffmpeg_opt: Creating new data stream for output format context 
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>

if input codec Id match with expected data stream of output format context
then only new stream with same codec id is created.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 12:32:22 +01:00
Michael Niedermayer
77f326dc36 ffmpeg: Make CFR frame drop threshold user adjustable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-04 02:40:41 +01:00
Michael Niedermayer
85d7e02e4a ffmpeg: allow overriding and amending AVStream->disposition 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-25 01:27:21 +01:00
Christophe Gisquet
ba6888c0e3 ffmpeg_opt: expand format for strftime 
While the shortened format specifiers are valid C99 ones, they are
not supported by e.g. some Visual Studio runtimes (and thus mingw).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-24 13:05:15 +01:00
Anshul Maheshwari
bb0344dc55 ffmpeg: improve data stream support 
This adds data codec/stream handling where previously there was only
audio/video/subtitles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 02:52:04 +01:00
Michael Niedermayer
558cef8860 ffmpeg_opt: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:10:23 +01:00
Michael Niedermayer
7efabffc28 ffmpeg_opt: Check for av_realloc_array() failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 18:22:37 +01:00
Michael Niedermayer
2d7fd4cc33 ffmpeg_opt: Use av_realloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 18:22:37 +01:00
Simon Thelen
cc63da1223 ffmpeg: add sdp_file option 
Allow printing of sdp information to a file specified by -sdp_file
This allows users to print sdp information when at least one of the
outputs isn't an rtp stream.

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-28 02:05:34 +01:00
Michael Niedermayer
988d27b802 Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e' 
* commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e':
  check memory errors from av_strdup()

Conflicts:
	avprobe.c
	libavformat/matroskaenc.c
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 04:57:25 +01:00
Christophe Gisquet
4c592c3908 ffmpeg: take bsf arguments from the command line 
The format is now:
-bsf:X filter1[=opt1=str1/opt2=str2],filter2
ie the parameters are appended after the filter name using '='. As ','
has been reserved already for the list of filters, '/' is just an
example of token separation for now, but that could become part of the
API to avoid each bsf using its own tokenization.

The proper solution would be using AVOption, but this is overkill for now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-30 13:11:34 +01:00
Lukasz Marek
3ff3990104 ffmpeg_opt: make use of recommended encoder configuration 
So far ffmpeg used recommended configuration only for codec priv options.
ffmpeg will use now codec defaults and then apply recommended configuration
for all options. Recommended configuration possibly contains minimal
set of options to filful user configuration.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-27 23:19:46 +01:00