30d770ca44
ffmpeg: Allow specifying the program number for created programs
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-16 14:03:57 +01:00
8f948b6244
ffmpeg: Add basic support to mux multiple programs
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-11 22:27:25 +01:00
4c96985af1
all: remove some casts of function pointer to void *
...
These casts are unnecessary, and may safely be removed.
Found by enabling -Wpedantic on clang 3.7.
Tested with FATE.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-10-24 15:14:59 -04:00
ddc6bd8c95
ffmpeg: add abort_on option to allow aborting on empty output
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-10-22 19:03:01 +02:00
dd8a4b0f8c
Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'
...
* commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8':
avconv: add support for Intel QSV-accelerated transcoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-22 16:18:02 +02:00
dbb03b8e47
ffmpeg_opt: rename loop option to stream_loop
...
The "loop" option is used in several demuxers (like img2dec) and muxers, using the same name in ffmpeg_opt
breaks them. Feel free to revert this and replace by any other solution or rename both as preferred
This is just as a quick fix to avoid the regression with existing command lines and to have both named
the same (which does not work)
Example:
./ffmpeg -loop 1 -i fate-suite/png1/lena-rgb24.png -t 1 test.avi
will produce 25 frames with the img2dec loop but only 1 frame at 25fps with the ffmpeg loop option
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-14 21:06:28 +02:00
9ccd90626f
Merge commit '16b0c929621f84983b83b9735ce973acb12723bc'
...
* commit '16b0c929621f84983b83b9735ce973acb12723bc':
avconv: Add loop option.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-14 14:28:20 +02:00
7255cf003e
Merge commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60'
...
* commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60':
avconv: Make the private options discovery more manifest
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 15:30:48 +02:00
e490fee6b9
Merge commit '3973f0f773e0bd212734eccda78aa798f8b20692'
...
* commit '3973f0f773e0bd212734eccda78aa798f8b20692':
Revert "avconv_opt: Allow printing private options"
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 15:29:46 +02:00
e34939ca76
Merge commit '7bb1c1bfd22de2200743af04ebd0c7c775f56f7e'
...
* commit '7bb1c1bfd22de2200743af04ebd0c7c775f56f7e':
avconv_opt: Allow printing private options
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-17 11:46:34 +02:00
a4188c9cd2
ffmpeg: Improve help text for -target.
...
Fixes ticket #1057 .
2015-09-02 14:32:06 +02:00
2fb593dcb9
Put remaining pieces of CODEC_FLAG_EMU_EDGE under FF_API_EMU_EDGE.
...
The amv one probably looks suspicious, but since it's an intra-only
codec, I couldn't possibly imagine what it would use the edge for,
and the vsynth fate result doesn't change, so it's probably OK.
2015-08-28 14:40:59 -04:00
da0e76955a
ffmpeg_opt: Add -hwaccels option that lists all supported hwaccels
2015-08-26 18:46:20 -07:00
b144008c1b
ffmpeg_opt: Add missing comma
2015-08-25 16:49:51 -07:00
ae2cb9290a
ffmpeg_opt: Prefer audio streams with packets
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-14 10:43:16 +02:00
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
11d923d414
avcodec: add new Videotoolbox hwaccel.
2015-08-03 10:12:10 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
8750aef3d6
ffmpeg_opt: Fix forcing fourccs
...
Fixes Ticket4682
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 05:10:51 +02:00
29cc0a178e
ffmpeg_opt: Fix sync_ist
...
This code was lost in 2663540821
2015-06-26 12:41:43 +02:00
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
6cfaa51acb
Merge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6'
...
* commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6':
avconv_opt: Check localtime() return value
Conflicts:
ffmpeg_opt.c
See: 8e91d9652e
2015-06-12 22:38:44 +02:00
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
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
18833daf9d
ffmpeg: Support copying unknown streams
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-21 18:21:38 +02:00
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
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
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
a2aff2690b
ffmpeg: support ignoring unsupported mapped streams
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-21 00:52:06 +02:00
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
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
107e4da476
ffmpeg_opt: Fix -timestamp parsing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09 13:07:00 +02:00
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
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
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
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
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
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
508d6a23b4
ffmpeg: allow to set the thread message queue size.
2015-02-26 19:19:56 +01:00
Michael Niedermayer
Ganesh Ajjanagadde
Marton Balint
Hendrik Leppkes
Carl Eugen Hoyos
Ronald S. Bultje
Timothy Gu
Sebastien Zwickert
Rodger Combs
Michael Niedermayer
wm4
Tim Nicholson
Nicolas George