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
efce76a80d
ffmpeg_filter: replace exit() by exit_program()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 11:09:22 +02:00
fc94b68eb5
Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1'
...
* commit '72fbc9685c08baae7ab9996642707eaab873b6f1':
avconv: use current syntax for the scale filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-10 22:51:04 +02:00
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
4818388e6c
Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a'
...
* commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a':
avconv: make output -ss insert trim/atrim filters.
Conflicts:
Changelog
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 17:24:43 +02:00
76c1f9200f
Merge commit 'a83c0da539fb07260310bc3b34056239d2b138b2'
...
* commit 'a83c0da539fb07260310bc3b34056239d2b138b2':
avconv: make -t insert trim/atrim filters.
The filter insertion code is merged but disabled as it is buggy.
For example it fails in various ways when used with -s with some files.
Also the trimming is arguably less accurate than the default without
filters in some cases.
These issues should be fixed before auto inserting the filters,
until then the user can explicitly add a trim/atrim filter when one is
wanted.
Conflicts:
Changelog
ffmpeg.c
ffmpeg_filter.c
tests/ref/fate/bethsoft-vid
tests/ref/lavf/aiff
tests/ref/lavf/asf
tests/ref/lavf/au
tests/ref/lavf/avi
tests/ref/lavf/dpx
tests/ref/lavf/ffm
tests/ref/lavf/gxf
tests/ref/lavf/jpg
tests/ref/lavf/mkv
tests/ref/lavf/mmf
tests/ref/lavf/mov
tests/ref/lavf/mpg
tests/ref/lavf/nut
tests/ref/lavf/ogg
tests/ref/lavf/pcx
tests/ref/lavf/png
tests/ref/lavf/rm
tests/ref/lavf/ts
tests/ref/lavf/voc
tests/ref/lavf/voc_s16
tests/ref/lavf/wav
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 14:23:52 +02:00
14369f59c5
ffmpeg_filter: fix leak on error
...
Fixes: CID1005311
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-21 11:59:34 +02:00
7b6c0bda9e
Merge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb'
...
* commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb':
avconv: update to the new options syntax.
Conflicts:
ffmpeg_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:19:32 +02:00
62d888ef0e
ffmpeg: use options for abuffersink.
...
Also remove unused buffersink_params.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 12:11:10 +02:00
231fd4411f
Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'
...
* commit '38f0c0781a6e099f11c0acec07f9b8be742190c4':
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
eabc0c733d
ffmpeg: insert format filter with the appropriate separator.
...
Similar to 937325f3
2013-04-11 18:05:46 +02:00
937325f3db
ffmpeg: insert aformat filter with the appropriate separator.
...
The ',' separator is deprecated with aformat, and thus causes various
arnings when transcoding audio.
2013-04-11 17:51:22 +02:00
ef7b6b489a
ffmpeg/avformat: factor av_guess_frame_rate() out
...
This will be used in ffplay
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-29 17:40:28 +01:00
Ronald S. Bultje
Michael Niedermayer
rogerdpack
Michael Niedermayer
Rodger Combs
Nicolas George
Carl Eugen Hoyos
Paul B Mahol
Nicolas George
Clément Bœsch