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
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
ceac5c54dd
Remove references to the "ff" variant of buffersink.
2013-03-12 23:31:07 +01:00
f9b34b8bf9
ffmpeg: port sub2video to AVFrame.
...
And re-enable the FATE test.
2013-03-10 13:45:15 +01:00
38d40ac18a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avconv: Make sure the encoder exists before inspecting supported_list
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-07 00:28:15 +01:00
e42028925b
ffmpeg: Force a first_pts of 0 for the first configuration of -async use
...
This is very close to what the default does currently
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-25 04:39:26 +01:00
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
6db37c9468
Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'
...
* commit '5c7db097ebe1fb5c233cedd8846615074e7d6044':
avconv: pass libavresample options to AVFilterGraph
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-24 17:41:31 +01:00
9fa5a47197
ffmpeg: set resample_pix_fmt for sub2video.
...
Forgotten when the resample_* fields were added.
Fix assert failures.
2013-02-21 12:41:30 +01:00
41f025dff0
ffmpeg: support filtering of unknown channel layouts.
2013-01-26 11:15:38 +01:00
102cf964dd
ffmpeg: sub2video: set resample size.
...
Necessary after 04a530f
2013-01-01 23:06:34 +01:00
a752b9b863
ffmpeg: use the new swr -async parameter instead of a set of parameters.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-12-25 17:22:14 +01:00
330983b728
Merge commit '10bca66101b79954512cd9d8ee20c3bc4513adf3'
...
* commit '10bca66101b79954512cd9d8ee20c3bc4513adf3':
cmdutils: add a macro to simplify grow_array() calls.
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-12-19 22:04:03 +01:00
7e6c68394f
ffmpeg_filter: use frame instead of decoder context pixel format
...
prevents regressions from h264-mt frame size changing code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-12-19 21:46:11 +01:00
04a530f7d3
ffmpeg_filter: use frame dimensions instead of decoder context dimensions.
...
avoids regression from the h264-mt frame size change code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-12-19 21:46:11 +01:00
718eab527b
ffmpeg: Improve filter input fps selection heuristic.
...
This fixes a broken file that has a incorrect timebase at the codec level.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-12-16 05:21:29 +01:00
54a71f2e6c
Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'
...
* commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56':
pixdesc: fix yuva 10bit bit depth
avconv: deprecate the -vol option
x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling
x86: af_volume: add SSE2-optimized s16 volume scaling
Conflicts:
ffmpeg.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-12-06 15:55:47 +01:00
b5e0e327ce
ffmpeg: fix swr filter_type for auto inserted aresample filters
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-11-26 04:06:19 +01:00
4bd6d73fc8
ffmpeg: fix passing swresample options to the auto inserted swr
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-11-26 03:51:29 +01:00
03b078721c
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
...
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
doc: git-howto: Leave reviewers time to react before pushing patches
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/git-howto.texi
ffmpeg_filter.c
libavcodec/flacdec.c
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/utils.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavutil/Makefile
libavutil/audioconvert.h
libavutil/channel_layout.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-11-12 11:32:11 +01:00
c3778df2d4
ffmpeg: fix negative array index
...
Fixes CID733808
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-22 13:58:19 +02:00
79393a8363
Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-20 18:00:13 +02:00
ba31e59e83
ffmpeg: Override r_frame_rate by corrected timebase only for interlaced streams
...
Fixes Ticket1664
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-16 01:04:42 +02:00
