summaryrefslogtreecommitdiff
path: root/ffmpeg_opt.c
Commit message (Collapse)AuthorAge
* ffmpeg_opt: route -ab to -b:aMichael Niedermayer2014-06-29
| | | | | | | Fixes combining -ab with -target pal-dvd Fixes Ticket3736 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Dont exit on avformat_find_stream_info() failure if there are ↵Michael Niedermayer2014-06-18
| | | | | | | | | 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>
* ffmpeg: support setting AVStream.discardMichael Niedermayer2014-06-07
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: remove unused variable and undocumented and not working command ↵Michael Niedermayer2014-06-07
| | | | | | line option Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: fix ffserver with the 2 encoder contextsMichael Niedermayer2014-06-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding contextMichael Niedermayer2014-06-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: fix attachment streamsMichael Niedermayer2014-06-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d'Michael Niedermayer2014-06-01
| | | | | | | | | | | * 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>
* Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'Michael Niedermayer2014-06-01
| | | | | | | | | | | | * 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>
* ffmpeg: use av_stream_get_end_pts()Michael Niedermayer2014-05-21
| | | | | | Simplifies code and should correct timing values when -*sync drop is used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: dont copy "encoder" metadata unless stream copy is usedMichael Niedermayer2014-05-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add last_mux_dts_plus_durationMichael Niedermayer2014-05-19
| | | | | | | 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>
* Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'Michael Niedermayer2014-05-12
| | | | | | | | | | * commit '1839fafa951308237c4672ffd9a94f927b26eac7': avconv: Support VDA hwaccel Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '9580818c5d934bde65a95efd2cee61c174721092'Michael Niedermayer2014-05-05
| | | | | | | | | | | * commit '9580818c5d934bde65a95efd2cee61c174721092': avconv: rename OutputStream.opts to OutputStream.encoder_opts Conflicts: ffmpeg.c ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'Michael Niedermayer2014-05-05
| | | | | | | | | | * commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66': avconv: rename InputStream.opts to InputStream.decoder_opts Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'Michael Niedermayer2014-04-29
| | | | | | | | | | | * commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a': configure: rework dxva in avconv handling Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'Michael Niedermayer2014-04-29
| | | | | | | | | | | * commit '35177ba77ff60a8b8839783f57e44bcc4214507a': avconv: add support for DXVA2 decoding Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: check that a subtitle encoder is available before auto mapping ↵Michael Niedermayer2014-03-16
| | | | | | | | streams Fixes Ticket3470 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Check ist is valid before using it in audio_channels_map initMichael Niedermayer2014-03-15
| | | | | | | Fixes segfault and instead provides an error message Fixes Ticket3465 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code checkTimothy Gu2014-02-25
| | | | | | | avio_open2() only return < 0 when error. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'Michael Niedermayer2014-02-24
| | | | | | | | | | | * commit '746dca483a2f0f2639265f6e1c0085c8861875a1': avconv: support forcing codec tags for input streams Conflicts: doc/ffmpeg.texi See: 6bca574a98ba604459f6ee92538b19d25bba0973 Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: support setting the chroma intra matrixMichael Niedermayer2014-02-18
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: assert_file_overwrite: Work for all file protocol outputsAlexander Strasser2014-02-16
| | | | | | | | | | | | 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>
* ffmpeg: do not fail when options are routed to libavformat and libavcodec ↵Michael Niedermayer2014-01-03
| | | | | | | | and only one can be used Fixes setting frame_size for pulse demuxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Fix -target vcdCarl Eugen Hoyos2013-12-25
| | | | | | | | The removed line makes no sense and doesnt work fixes ticket #3239 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-12-04
| | | | | | | * qatar/master: avconv: initialize hwaccel_pix_fmt Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'Michael Niedermayer2013-11-23
| | | | | | | | | | | | | * commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea': avconv: add support for VDPAU decoding Conflicts: Changelog Makefile configure ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'Michael Niedermayer2013-11-23
| | | | | | | | | | | | | * 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>
* ffmpeg: Do not fill gap before the first decodable frame on single stream ↵Michael Niedermayer2013-11-16
| | | | | | | | | | | | | 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>
* ffmpeg_opt: fix overriding values set by -targetMichael Niedermayer2013-11-13
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: generate more specific error message in case of inconsistent ↵Stefano Sabatini2013-11-09
| | | | | | | | filtering options In particular, distinguish if the option was -filter or -filter_script. Suggested-by: Nicolas George
* ffmpeg: store value of -filter and -filter_script per-stream option in ↵Stefano Sabatini2013-11-09
| | | | | | | OutputStream struct Avoid the need for multiple potentially inconsistent access operations, slightly factorize code.
* ffmpeg: add verbose consistency checks in case of filtering inconsistent optionsStefano Sabatini2013-11-03
| | | | | In particular, warn in case -filter and streamcopy is used at the same time, fix trac ticket #678.
* make it possible to compile ffmpeg without swscalePaul B Mahol2013-10-21
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* ffmpeg: add max_error_rate to allow tuning the point decoding errors are ↵Michael Niedermayer2013-10-07
| | | | | | | considered a failure of the whole transcoding. Suggested-by: Daemon404 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: avoid direct access to lowres use av_codec_g/set_lowres()Michael Niedermayer2013-10-03
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add support to force specific AVCodecsMichael Niedermayer2013-10-02
| | | | | | | | previously only codec_ids could be forced, which did not allow forcing a specific implementation like libopenjpeg vs jpeg2000. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'Michael Niedermayer2013-08-06
| | | | | | | | | | | * commit '488a0fa68973d48e264d54f1722f7afb18afbea7': avconv: support -t as an input option. Conflicts: Changelog ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Remove support for specifying -t anywhere to set the durationMichael Niedermayer2013-08-06
| | | | | | This would otherwise conflict with the semantics of using -t for the input Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'Michael Niedermayer2013-08-06
| | | | | | | | | | | | | * 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>
* Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'Michael Niedermayer2013-08-06
| | | | | | | | | | | * 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>
* Merge commit '7748dd41be3d6dd6300f14263586af4ee104ead2'Michael Niedermayer2013-08-01
| | | | | | | | | | | | | * commit '7748dd41be3d6dd6300f14263586af4ee104ead2': avconv: add -n option to immediately exit when output files already exist Conflicts: Changelog doc/ffmpeg.texi ffmpeg_opt.c See: 0a4f02117b67c135a27e3490aea1631ad9f4312f Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: do not warn about unused gop_timecodeMichael Niedermayer2013-07-09
| | | | | | | | The option is injected by generic code and being sometimes unused is normal. Fixes Ticket2762 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Allow overriding ffservers inputMichael Niedermayer2013-07-09
| | | | | | Fixes Ticket1970 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: move creation_time for ffserver setting upMichael Niedermayer2013-07-09
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: replace exit() by exit_program()Michael Niedermayer2013-07-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add -apad option which injects a apad filter only in the presence of ↵Michael Niedermayer2013-05-08
| | | | | | video streams Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: move a local variable definition later.Nicolas George2013-05-07
| | | | Fix a segfault when using the -map option without input files.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-03
| | | | | | | | | | * qatar/master: avconv: do not send non-monotonous DTS to the muxers. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '3d624420086ed3cd0c74f4510f0285968e21c117'Michael Niedermayer2013-05-01
| | | | | | | | | | * commit '3d624420086ed3cd0c74f4510f0285968e21c117': avconv_opt: allocate an OutputFile before the streams. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>