summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
* Merge commit 'e63e3797a1ed9346f529848e6ba3d27fd2d2cc8d'Hendrik Leppkes2015-12-17
|\ | | | | | | | | | | | | * commit 'e63e3797a1ed9346f529848e6ba3d27fd2d2cc8d': avconv: pass the global codec side data to the muxer Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | ffmpeg: add progress speed to status line and reportMoritz Barsnick2015-12-17
| | | | | | | | | | | | | | | | This adds a computation of the progress speed versus realtime ("Nx") to the status line and to the report log. It uses the progress time as already calculated for total output time as a base. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: change command line option -dump to work without -loglevel debugTom Marecek2015-12-11
| | | | | | | | | | | | | | | | | | | | -hex and -dump command line options do nothing unless -loglevel debug is set. -dump by itself is useful for monitoring live streams (to get the current PTS for example) however when it is used with -loglevel debug for an RTMP stream, librtmp also dumps the packet data which makes the output too noisy. do_pkt_dump is only set in check_keyboard_interaction or by the -dump command line option so this change should have no effect on any other parts of the code.. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: When streamcopying, only add the input seek position when copying ↵Simon Thelen2015-12-05
| | | | | | | | | | | | | | | | | | | | | | | | | | timestamps. Using -ss as an input option shifts timestamps down by the seek, so it doesn't have to be added to the recording time when checking whether to stop. Fixes #977 Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: enable echoing with command and debug modesClément Bœsch2015-12-04
| | | | | | | | Allow seeing text when pressing 'c' or 'd'.
* | ffmpeg: Check pkt_dts for AV_NOPTS_VALUEMichael Niedermayer2015-12-04
| | | | | | | | | | | | | | | | Fixes integer overflow Fixes: 1536b9b096a8f95b742bae9d3d761cc6/signal_sigsegv_294aaed_2039_8d1797aeb823ea43858d0fa45c9eb899.ogv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: fix -copy_prior_start 0 with -copyts and input -ssRodger Combs2015-11-20
| | | | | | | | | | | | Also rearranged the relevant check to reduce code duplication Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: preserve profile for audio stream copyMaksym Veremeyenko2015-11-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Simplify fps code related to delta0Bryan Huh2015-11-16
| | | | | | | | | | | | | | | | Small refactor of fps code for improved readability. In particular the "cor" variable was unnecessary and misleading because it would always be set to -delta0. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Fixing typos and adding comments to fps codeBryan Huh2015-11-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Fix integer overflow with cur_dts being AV_NOPTS_VALUEMichael Niedermayer2015-11-11
| | | | | | | | Since de0e219a8aba72de201e85385c746cd1c04be1a2 cur_dts is sometimes invalid
* | ffmpeg: Print a warning if a pkt duration is already set before using the ↵Michael Niedermayer2015-11-11
| | | | | | | | | | | | | | | | | | frame rate I didnt find any case that triggers this but if it gets triggered it needs to be investigated Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: set muxer packet duration based on framerate only for CFRMichael Niedermayer2015-11-11
| | | | | | | | | | | | | | | | | | | | | | a set ost->frame_rate does not imply CFR in ffmpeg The changed fate tests had all wrong packet durations (like 1/1000 or 1/90000) There might be more cases in which is_cfr could be set Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '3efd71b4d0b4a73ccbbbdc092e6bbd54d92633f4'Hendrik Leppkes2015-11-10
|\| | | | | | | | | | | | | * commit '3efd71b4d0b4a73ccbbbdc092e6bbd54d92633f4': avconv: set packet duration for CFR video streams Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | ffmpeg: Don't try and write sdp info if none of the outputs had an rtp format.Simon Thelen2015-11-09
| | | | | | | | | | | | | | Fixes a segfault when trying to write nonexistent rtp information. Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | all: use FFDIFFSIGN to resolve possible undefined behavior in comparatorsGanesh Ajjanagadde2015-11-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FFDIFFSIGN was created explicitly for this purpose, since the common return a - b idiom is unsafe regarding overflow on signed integers. It optimizes to branchless code on common compilers. FFDIFFSIGN also has the subjective benefit of being easier to read due to lack of ternary operators. Tested with FATE. Things not covered by this are unsigned integers, for which overflows are well defined, and also places where overflow is clearly impossible, e.g an instance where the a - b was being done on 24 bit values. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | ffmpeg: use log10 instead of log()/log(10)Ganesh Ajjanagadde2015-10-29
| | | | | | | | | | | | | | | | | | This is more concise and conveys the intent better. Furthermore, it is likely more precise as well due to lack of floating point division. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | Merge commit 'cd0e08813a0484002b5defbf557c859f123953ae'Hendrik Leppkes2015-10-29
|\| | | | | | | | | | | | | * commit 'cd0e08813a0484002b5defbf557c859f123953ae': avconv: support infinite loop for the loop option Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | Replace remaining occurances of av_free_packet with av_packet_unrefHendrik Leppkes2015-10-27
| |
* | Merge commit 'a5d42043093a39636a1f4021a37dd9c612479f6f'Hendrik Leppkes2015-10-27
|\| | | | | | | | | | | | | * commit 'a5d42043093a39636a1f4021a37dd9c612479f6f': avformat: Always return ref-counted AVPacket Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | ffmpeg: add abort_on option to allow aborting on empty outputMarton Balint2015-10-22
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8': avconv: add support for Intel QSV-accelerated transcoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | ffmpeg: exit on corrupt packets or decoded frames if exit_on_error flag is ↵Marton Balint2015-10-22
| | | | | | | | | | | | | | present Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffmpeg: factorize checking decoder resultMarton Balint2015-10-22
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffmpeg: exit on av_write_trailer failure if exit_on_error is setMarton Balint2015-10-22
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffmpeg: log failed av_write_trailerMarton Balint2015-10-22
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffmpeg: add deprecation guards around remaining AVFMT_RAWPICTURE usageHendrik Leppkes2015-10-14
| |
* | ffmpeg: remove trailing whitespace that sneaked into the previous mergeHendrik Leppkes2015-10-14
| |
* | Merge commit '16b0c929621f84983b83b9735ce973acb12723bc'Hendrik Leppkes2015-10-14
|\| | | | | | | | | | | | | * commit '16b0c929621f84983b83b9735ce973acb12723bc': avconv: Add loop option. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | ffmpeg: modify tty state when stderr is redirectedGanesh Ajjanagadde2015-10-11
| | | | | | | | | | | | | | Removes unnecessary isatty(), fixes Ticket2964 Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | ffmpeg: avoid possible undefined behaviorGanesh Ajjanagadde2015-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On lines 1633,1634 FFABS(pts) is performed. However, if av_stream_get_end_pts returns AV_NOPTS_VALUE always, pts remains stuck at INT64_MIN, leading to undefined behavior on FFABS. One could conceive of a solution using FFNABS. However, such a solution has to deal with the implementation defined rounding of integer division with at least one negative operand in ANSI C89. C99 forces truncation to zero, but I am not sure that all of our platforms compile with full C99 support, and in particular whether we can safely assume a fixed rounding behavior across all platforms. This solution is simple, and I doubt changing INT64_MIN to INT64_MIN + 1 has any practical loss - if it is stuck at its initial value, the stream is messed up anyway. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '6064f697a321174232a3fad351afb21150c3e9e5'Hendrik Leppkes2015-09-12
|\| | | | | | | | | | | | | * commit '6064f697a321174232a3fad351afb21150c3e9e5': lavc: Enable side data only packets by default Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | Remove left-over FF_API_DESTRUCT_PACKET cruftHendrik Leppkes2015-09-05
| |
* | Remove left-over FF_API_AVFILTERBUFFER cruftHendrik Leppkes2015-09-05
| |
* | ffmpeg: Drop redundant ist checkMichael Niedermayer2015-09-04
| | | | | | | | | | | | | | stream copy always has a input stream, it cannot use complex video/audio filters with unambigous input Fixes CID1322348 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: force 128k default audio bitrate if nothing is specified and there ↵Michael Niedermayer2015-08-28
| | | | | | | | | | | | | | | | is no specific default This prevents breaking existing command lines in case the "ab" default is removed from libavcodec Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | add missing FF_API_DESTRUCT_PACKET guardsAndreas Cadhalpun2015-08-22
| | | | | | | | | | Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | ffmpeg: use av_err2str()Michael Niedermayer2015-08-21
| | | | | | | | | | Found-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Use correct codec_id for av_parser_change() checkMichael Niedermayer2015-08-21
| | | | | | | | | | | | No testcase known Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Check av_parser_change() for failureMichael Niedermayer2015-08-21
| | | | | | | | | | | | No testcase known Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Check for RAWVIDEO and do not relay only on AVFMT_RAWPICTUREMichael Niedermayer2015-08-21
| | | | | | | | | | | | | | | | The null muxer has AVFMT_RAWPICTURE set but can be fed with non-raw material related to Ticket4778 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: check avpicture_fill() return valueMichael Niedermayer2015-08-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Replace av_dlog with ff_dlog.Ronald S. Bultje2015-08-18
| | | | | | | | | | ff_dlog checks compilability, and is non-public. av_dlog is deprecated and no longer exists if FF_API_DLOG=0.
* | ffmpeg: use av_buffersrc_add_frame instead of av_buffersrc_add_refAndreas Cadhalpun2015-08-16
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | ffmpeg: Use the decoders dimensions in sub2video_get_blank_frame()Michael Niedermayer2015-08-15
| | | | | | | | | | | | Fixes Ticket4744 part3 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Use actual frame dimensions in checks in sub2video_update()Michael Niedermayer2015-08-15
| | | | | | | | | | | | Fixes Ticket4744 part2 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Print sub2video: rectangle coordinates in case of overflowsMichael Niedermayer2015-08-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: replace deprecated av_log_ask_for_sample with av_logAndreas Cadhalpun2015-08-12
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | ffmpeg: switch swscale option handling to AVDictionary similar to what the ↵Michael Niedermayer2015-08-08
| | | | | | | | | | | | other subsystems use Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: remove access to private FILE struct members on WindowsHendrik Leppkes2015-08-04
| | | | | | | | | | | | | | | | The FILE struct is opaque in MSVC 2015, and the members of this struct were never meant to be accessed in any case. No conditions are known where this check was needed to get characters from stdin.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 21:32:29 +0000