1b04ea1a6c
Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into merge
...
* commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee':
avconv: create simple filtergraphs earlier
Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-03 20:53:03 -07:00
9aa3023672
Merge commit '49670e4218d34899a1c37abb7a11615efc16f757'
...
* commit '49670e4218d34899a1c37abb7a11615efc16f757':
avconv: add a function for determining whether a filtergraph is simple
Conflicts:
avconv.c
Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-03 20:33:57 -07:00
4a81bddb4d
ffmpeg_filter: Fix AVBufferSrcParameters leak
...
Fixed: CID1361950
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-05-19 00:10:27 +02:00
172d3568b3
Merge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f'
...
* commit '5d273d3efac340ef8de445c955ff44c7abed4e8f':
avconv: VAAPI hwcontext initialisation and hwaccel helper
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 22:39:39 +01:00
06eef96b69
fix some a/an typos
...
Signed-off-by: Lou Logan <lou@lrcd.com>
2016-03-28 14:13:17 -08:00
d94b11a721
ffmpeg_filter: Factor get_compliance_unofficial_pix_fmts() out
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-10 13:28:23 +01:00
82d2aa2b32
ffmpeg_filter: Add missing pixel formats to strict_std_compliance case for ljpeg
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-10 13:28:23 +01:00
a82ff49bb8
ffmpeg_filter: Add YUV 444 to strict_std_compliance case for mjpeg
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-10 13:28:23 +01:00
8f3a960353
ffmpeg_filter: remove redundant null ptr check
...
Fixes: CID1338331
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-11 01:51:52 +01:00
e8e7eb150f
ffmpeg_filter: check encoder before using it to set frame size.
...
Fix a segfault when no encoder is found for a default codec
with a complex filter graph.
2015-10-30 10:55:10 +01:00
14573b9b7c
Revert "Merge commit '8b830ee9a26d47b138f12a82085cdb372f407f1e'" (avconv: Do not try to configure filter outputs without streams)
...
FFmpeg already tests for this case in configure_output_filter() and printed a
clearer error message
example:
./ffmpeg -f lavfi -i color -f lavfi -i color -filter_complex "[1]null[x],[0][1]overlay" -f null -
before the merge / after the revert:
Filter null has a unconnected output
after the merge / before the revert:
Output pad "default" with type video of the filter instance "Parsed_null_0" of null not connected to any destination
Error configuring complex filters.
Invalid argument
This reverts commit 3e3779cd510b28039a44
2015-10-11 12:24:43 +02:00
3e3779cd51
Merge commit '8b830ee9a26d47b138f12a82085cdb372f407f1e'
...
* commit '8b830ee9a26d47b138f12a82085cdb372f407f1e':
avconv: Do not try to configure filter outputs without streams
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-10 09:43:47 +02:00
6495c4c687
lavfi: fix compilation with FF_API_OLD_FILTER_OPTS=0.
2015-08-18 22:22:49 -04:00
72237ef6e9
ffmpeg_filter: Do not override the dimensions in sub2video_prepare()
...
Fixes ticket4744 part1
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-15 17:41:48 +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
444e9874a7
Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'
...
* commit 'def97856de6021965db86c25a732d78689bd6bb0':
lavc: AV-prefix all codec capabilities
Conflicts:
cmdutils.c
ffmpeg.c
ffplay.c
libavcodec/8svx.c
libavcodec/aacenc.c
libavcodec/ac3dec.c
libavcodec/adpcm.c
libavcodec/alac.c
libavcodec/atrac3plusdec.c
libavcodec/bink.c
libavcodec/dnxhddec.c
libavcodec/dvdec.c
libavcodec/dvenc.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/fic.c
libavcodec/flacdec.c
libavcodec/flacenc.c
libavcodec/flvdec.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/gifdec.c
libavcodec/h261dec.c
libavcodec/hevc.c
libavcodec/iff.c
libavcodec/imc.c
libavcodec/libopenjpegdec.c
libavcodec/libvo-aacenc.c
libavcodec/libvorbisenc.c
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mpegaudiodec_float.c
libavcodec/msmpeg4dec.c
libavcodec/mxpegdec.c
libavcodec/nvenc_h264.c
libavcodec/nvenc_hevc.c
libavcodec/pngdec.c
libavcodec/qpeg.c
libavcodec/ra288.c
libavcodec/rv10.c
libavcodec/s302m.c
libavcodec/sp5xdec.c
libavcodec/takdec.c
libavcodec/tiff.c
libavcodec/tta.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/vp6.c
libavcodec/vp9.c
libavcodec/wavpack.c
libavcodec/yop.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 22:50:18 +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
2dbaec690d
ffmpeg_filter: Check that filters have connected outputs before accessing the output stream
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 15:36:59 +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
a1c03b9d58
ffmpeg_filter: log more information on failure to init simple filter graph
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-02 04:56:10 +02:00
800df6a849
ffmpeg_filter: use get_rotation()
...
This unifies the rotation extraction code between ffplay and ffmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-04 00:14:36 +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
39f247121e
ffmpeg: fix accurate seeking with -copyts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-24 17:31:26 +01:00
90cdec5e26
ffmpeg: init sub2video.last_pts.
...
Get the heartbeat working when the video has negative timestamps.
Fix trac ticket #4062 .
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-05 21:04:36 +01:00
1dd38e99fd
Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'
...
* commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581':
avconv: fix leak in filter error
Conflicts:
ffmpeg_filter.c
See: 14369f59c5
2014-10-17 13:47:49 +02:00
16de4d927e
ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not just when changing audio resample parameters
...
Fixes Ticket3562
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 04:55:58 +02:00
b01d2a5533
ffmpeg: Enable compute_edt only when the subtitles are used for a output stream instead of a filter
...
Fixes/works around Ticket3768
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01 19:51:58 +02:00
494cbc4238
ffmpeg: Clean up if filter initialisation failed to avoid a memleak.
...
Fixes ticket #3858 .
Reviewed-by: Nicolas George
2014-08-30 13:01:51 +02:00
91244073fd
ffmpeg_filter: refuse to configure input without a decoder.
...
The decoder is necessary in order to filter frames.
This makes the error message clearer in this case:
currently, it will usually fail because the pixel or sample
format is not defined and is converted into "(null)"
(non-portable).
Enhance trac ticket #3779 .
2014-07-30 14:40:45 +02:00
758f929d21
ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding context
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 17:16:08 +02:00
0949ff93c0
ffmpeg_filter: fix choose_pix_fmts() so it uses the correct encoding context
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 17:15:46 +02:00
862120f980
Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d'
...
* commit '383136264ef40452efd86cafb2d7221cd3830b3d':
avconv: do not use the stream codec context for encoding
Conflicts:
ffmpeg.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 15:53:23 +02:00
921d5ae3bc
ffmpeg: replace remaining, ffmpeg specific ist->st->codec by ist->dec_ctx
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 15:30:51 +02:00
d097935767
Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'
...
* commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5':
avconv: do not use the stream codec context for decoding
Conflicts:
ffmpeg.c
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 14:35:53 +02:00
d5ec1ddf7b
Merge commit '9580818c5d934bde65a95efd2cee61c174721092'
...
* commit '9580818c5d934bde65a95efd2cee61c174721092':
avconv: rename OutputStream.opts to OutputStream.encoder_opts
Conflicts:
ffmpeg.c
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 15:51:55 +02:00
d80e7ba9b7
ffmpeg_filter: make *jpeg_formats static const
...
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-28 00:22:38 +02:00
09b16619d3
ffmpeg_filter: fix pointer to local outside scope
...
Fixes CID1206652
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-27 05:07:29 +02:00
ccdfa3e271
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Add missing #includes for *INT64_MAX and *INT64_C
Conflicts:
ffmpeg.c
ffmpeg_filter.c
ffplay.c
libavformat/assdec.c
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24 05:21:19 +01:00
62e10c3759
Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'
...
* commit '07fd0a22192805d56c635eb294dc26b0a54ae325':
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
d9bc251d39
ffmpeg_filter: Fix non jpeg yuv in jpeg support
...
This is a regression, did not bisect so dont know what caused it but
likely some changes to the command line handling code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 17:41:06 +01:00
da54ad9a72
ffmpeg_filter: Pass command line -threads X to filtergraph
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-24 23:15:30 +02:00
640a36a05c
ffmpeg_filter: check that the input media type match the filter
...
Fixes Ticket2012
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-14 03:03:41 +02:00
d4ab1292e9
ffmpeg_filter: do not pick evil path for trim filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-12 10:59:09 +00:00
dd9555e94b
ffmpeg: remove obsolete workaround in trim insertion.
...
The bug it was working seems to have been fixed.
This change causes ffmpeg to use the trim filter to implement
the -t option.
FATE tests are updated due to the more accurate handling of
the last packets.
2013-08-07 16:20:41 +02:00
b7fc2693c7
Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'
...
* commit '488a0fa68973d48e264d54f1722f7afb18afbea7':
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
7cbef2ed7e
Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'
...
* commit '811bd0784679dfcb4ed02043a37c92f9df10500e':
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
3fa72de82f
Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'
...
* commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8':
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
84bc317019
Merge commit '2e661f26f8b12195f75ae3b07d9591e395135bc7'
...
* commit '2e661f26f8b12195f75ae3b07d9591e395135bc7':
avconv: insert extra filters in the same way for both graph inputs and outputs
Conflicts:
ffmpeg_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 10:08:17 +02:00
a59a64cbc8
Merge commit '06cd4c5a68e23f5be199c0d2d563da80989f839f'
...
* commit '06cd4c5a68e23f5be199c0d2d563da80989f839f':
avconv: fix usage of deprecated lavfi API
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 09:20:22 +02:00
783c674da7
Merge commit '51fc88e7467169031b20b9983d80456b893a9fa3'
...
* commit '51fc88e7467169031b20b9983d80456b893a9fa3':
avconv: improve some variable names
Conflicts:
ffmpeg_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-05 09:32:31 +02:00
Timothy Gu
Michael Niedermayer
Derek Buitenhuis
Lou Logan
Nicolas George
Hendrik Leppkes
Ronald S. Bultje
rogerdpack
Michael Niedermayer
Rodger Combs
Carl Eugen Hoyos
Paul B Mahol
Nicolas George