e971eef8c0
Set -scan_all_pmts 1 in ffmpeg, ffplay and ffprobe if not set by user.
...
Fixes ticket #3762 .
2014-11-09 18:28:29 +01:00
2b14593148
ffmpeg_opt: free incorrect priv_data for feed stream
...
new_output_stream creates a codec context with arbitraty picked codec.
Later data is updated, but priv_data are left alone.
There is a bit chance there is a mismatch between codecs.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 02:14:02 +01:00
37425fcb04
doc: clarify -frames options behavior
...
Replace "frames to record" with "frames to output". The "to record"
makes it seem like an input option, or that it would capture the frames
instead of outputting them.
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-11-04 16:25:47 -09:00
66b9e60af0
ffmpeg_opt: store canvas size in decoder context
...
Fixes canvas size
Fixes Ticket4074
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-04 20:55:15 +01:00
c0002ddb01
ffmpeg_opt: Check the return code from strftime()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-26 17:07:29 +01:00
7a649e0783
Print an error if -r and -vsync 0 are used together.
...
Fixes ticket #4041 .
2014-10-23 23:27:46 +02:00
315f9e929d
ffmpeg_opt: Add -start_at_zero option.
...
This automatically shifts input timestamps to start at 0 instead of the file's
starting timestamp when using -copyts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21 03:31:33 +02:00
8c4ca4aa5a
ffmpeg_opt: abort if -to <= -ss
...
Makes ffmpeg abort instead of continuing when stop_time <= start_time.
Closes ticket #4015 .
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-11 22:20:39 +02:00
403133ab5e
ffmpeg: add vdpau_old to allow continued testing of the older (but not oldest) API
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-06 16:09:02 +02:00
e113692c89
lavu/ffmpeg_opt: Check return value of avcodec_find_encoder().
...
Prevents a segfault if a stream featuring a known but unavailable codec (like external lib codec) should be opened.
Bug found by: Jonas Geistert <j.geistert@yahoo.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 18:03:09 +02:00
7a67ab5cba
ffmpeg_opt: reduce diff to libav in opt_target() by 16 lines
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27 14:27:30 +02:00
2082c00ea2
Merge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5'
...
* commit 'f5245a9c6206878b892adf3ccbccc9311c202af5':
avconv: fix parsing the AVOptions for -target
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27 12:55:31 +02:00
a0941c8a2b
Use new av_dict_set_int helper function.
...
Get rid of the many, slightly differing, implementations
of basically the same thing.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-16 14:31:41 +02:00
11aab8d6cb
ffmpeg: look for encoding options in both avcodec and avformat
...
This patch is the same as 8a1714ad85
2014-08-15 23:56:09 +02:00
d3a22491c7
ffmpeg: remove 32 channel limit from audio_channels_map
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 05:38:47 +02:00
7d585bc94c
Do not automatically map subtitles if the decoder and encoder properties are different.
...
Fixes ticket #3819 .
2014-08-07 13:18:00 +02:00
7d03732f7e
ffmpeg: Do not fail if a demuxer and decoder use the same option identifer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 13:33:44 +02:00
956f4087c6
ffmpeg_opt: Use av_guess_codec() instead of AVOutputFormat->*codec
...
Fixes part of ticket2236
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 03:29:42 +02:00
25a2060890
Merge commit 'dc71f1958846bb1d96de43a4603983dc8450cfcc'
...
* commit 'dc71f1958846bb1d96de43a4603983dc8450cfcc':
video4linux2: Avoid a floating point exception
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 00:06:32 +02:00
e10b62ab5d
ffmpeg_opt: remove intra_dc_precision, its handled by AVOptions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-15 20:18:19 +02:00
f02a440814
ffmpeg_opt: route -ab to -b:a
...
Fixes combining -ab with -target pal-dvd
Fixes Ticket3736
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-29 02:47:49 +02:00
eec55e622a
ffmpeg_opt: Dont exit on avformat_find_stream_info() failure if there are streams
...
This allows "-codec copy -f framecrc" on files with only unindentifyable streams
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18 21:35:54 +02:00
01ef127bf8
ffmpeg: support setting AVStream.discard
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 21:26:22 +02:00
5affab960c
ffmpeg_opt: remove unused variable and undocumented and not working command line option
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 21:13:08 +02:00
909dbb07eb
ffmpeg_opt: fix ffserver with the 2 encoder contexts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 17:29:59 +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
229022e788
ffmpeg_opt: fix attachment streams
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 17:15:56 +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
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
1f359c8559
ffmpeg: use av_stream_get_end_pts()
...
Simplifies code and should correct timing values when -*sync drop is used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-21 18:53:42 +02:00
be2bbc5266
ffmpeg_opt: dont copy "encoder" metadata unless stream copy is used
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 02:01:18 +02:00
87f5ede6b5
ffmpeg: add last_mux_dts_plus_duration
...
Fixes 1 frame error in the duration and derived values,
introduced by not using AVStream.pts in the previous commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19 15:35:20 +02:00
5460ab73d2
Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'
...
* commit '1839fafa951308237c4672ffd9a94f927b26eac7':
avconv: Support VDA hwaccel
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12 02:44:28 +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
42b7bda41a
Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'
...
* commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66':
avconv: rename InputStream.opts to InputStream.decoder_opts
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 14:44:33 +02:00
21c7e99659
Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'
...
* commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a':
configure: rework dxva in avconv handling
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 01:47:53 +02:00
c6eee3120a
Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'
...
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
avconv: add support for DXVA2 decoding
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 01:22:22 +02:00
25bcf24d4d
ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams
...
Fixes Ticket3470
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16 15:15:02 +01:00
8803b970ef
ffmpeg_opt: Check ist is valid before using it in audio_channels_map init
...
Fixes segfault and instead provides an error message
Fixes Ticket3465
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15 22:14:08 +01:00
774239be71
ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check
...
avio_open2() only return < 0 when error.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-25 00:05:37 +01:00
cc6cc84bc4
Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'
...
* commit '746dca483a2f0f2639265f6e1c0085c8861875a1':
avconv: support forcing codec tags for input streams
Conflicts:
doc/ffmpeg.texi
See: 6bca574a98
2014-02-24 09:15:46 +01:00
3e70c7023e
ffmpeg: support setting the chroma intra matrix
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-18 18:19:28 +01:00
2b17c7685f
ffmpeg_opt: assert_file_overwrite: Work for all file protocol outputs
...
Currently the file overwrite check does not work for paths that
contain a colon.
Use avio_find_protocol to always execute the existence check if
the file protocol is going to be used.
Fix remaining part of ticket #3249 .
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2014-02-16 22:34:21 +01:00
8a1714ad85
ffmpeg: do not fail when options are routed to libavformat and libavcodec and only one can be used
...
Fixes setting frame_size for pulse demuxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-03 02:24:27 +01:00
e079661d23
ffmpeg_opt: Fix -target vcd
...
The removed line makes no sense and doesnt work
fixes ticket #3239
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-25 21:31:19 +01:00
c302811643
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avconv: initialize hwaccel_pix_fmt
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-04 04:30:46 +01:00
3e641b4842
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
...
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
avconv: add support for VDPAU decoding
Conflicts:
Changelog
Makefile
configure
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23 14:46:48 +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
d7ebeba80c
ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it.
...
Fixes different behavior to JM and probably several if not all
reference decoders.
We cannot just do this unconditionally as it would ruin AV sync in
some use cases.
Bug-Found-by: BugMaster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-16 14:27:29 +01:00
9647c6dedd
ffmpeg_opt: fix overriding values set by -target
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-13 22:07:19 +01:00
Carl Eugen Hoyos
Lukasz Marek
Lou Logan
Michael Niedermayer
Rodger Combs
Simon Thelen
Thilo Borgmann
Reimar Döffinger
Clément Bœsch
Timothy Gu
Alexander Strasser