aboutsummaryrefslogtreecommitdiff
path: root/ffmpeg.c
AgeCommit message (Collapse)Author
2014-12-28ffmpeg: Use av_freep(), avoid leaving stale pointers in memoryMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-28ffmpeg: add sdp_file optionSimon Thelen
Allow printing of sdp information to a file specified by -sdp_file This allows users to print sdp information when at least one of the outputs isn't an rtp stream. Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-15ffmpeg: Check for subtitle_out malloc failureMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-14ffmpeg: forward r_frame_rate to the muxer in case of stream copyMichael Niedermayer
Fixes Ticket3629 part2 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-03ffmpeg: drop usage of coded_frameMichael Niedermayer
It causes all kinds of problems and there is no code in the muxers that reads this field Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-30ffmpeg: take bsf arguments from the command lineChristophe Gisquet
The format is now: -bsf:X filter1[=opt1=str1/opt2=str2],filter2 ie the parameters are appended after the filter name using '='. As ',' has been reserved already for the list of filters, '/' is just an example of token separation for now, but that could become part of the API to avoid each bsf using its own tokenization. The proper solution would be using AVOption, but this is overkill for now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-27ffmpeg: Print a debug message if the frame parameters mismatch the contextMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-19ffmpeg: skip duration cliping for passthrough & drop modesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-19ffmpeg: Check duration for overlap and clip in fps cfr/vfr codeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-19ffmpeg: Use input packet duration in vfr/cfr code if available and validMichael Niedermayer
Fixes Ticket3052
2014-11-19ffmpeg: fix printed timestamp for droped framesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-19ffmpeg: better CFR frame duplication selectionMichael Niedermayer
This improves the handling of cases where the frame duration is not known Fixes Ticket 4119 Fixes Ticket 1578 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-19ffmpeg: fix variable type for end charMichael Niedermayer
fixes warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-17ffmpeg: Fix last newline at log level less than "info"Michael Niedermayer
Fixes Ticket3058 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24Merge commit '88b32673db39440422a73ec3047d3326c96b4fb2'Michael Niedermayer
* commit '88b32673db39440422a73ec3047d3326c96b4fb2': avconv: copy stream-level side data when streamcopying Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24Merge commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f'Michael Niedermayer
* commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f': avconv: Use av_gettime_relative Conflicts: ffmpeg.c See: 76191c08f88fd66cf9198afc0c4a809c4c0336d4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-22ffmpeg: avoid endlessly reading from one input while another is unavailableMichael Niedermayer
Testcase in Ticket 4051 Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'Michael Niedermayer
* commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283': lavc: deprecate unused me_threshold field Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-17Merge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a'Michael Niedermayer
* commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a': avconv: check return value Conflicts: ffmpeg.c See: 4930cd13d634d5f4e284de3a955d5c6a84fd65e2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15Merge commit '557d4c4ecae080729e68df54ed2bd8420d0f037a'Michael Niedermayer
* commit '557d4c4ecae080729e68df54ed2bd8420d0f037a': avconv: replace AVCodecContext.time_base with framerate Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-14ffmpeg: Fix stream copy with initial_paddingMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-27Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8'Michael Niedermayer
* commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8': avconv: Use only audio and video to guess discontinuities Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-23ffmpeg: replace impossible dts/pts combinations by a reasonable guess ↵Michael Niedermayer
instead of hard failing Fixes stream copy from tserror270.ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph ↵Michael Niedermayer
not just when changing audio resample parameters Fixes Ticket3562 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-07ffmpeg: Copy extradata if it has been initialized later from the encoderMichael Niedermayer
Fixes Ticket3909 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01ffmpeg: Enable compute_edt only when the subtitles are used for a output ↵Michael Niedermayer
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-01avcodec/dvbsubdec: make compute_edt user settableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28ffmpeg: Fix missing {} in Stream to Packet side data codeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15Drop remaining unneeded != NULLMichael Niedermayer
Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15ffmpeg: remove 32 channel limit from audio_channels_mapMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15ffmpeg: fix streamcopy with side dataChristophe Gisquet
The issue is that, when the main packet data buffer is changed, streamcopy uses a temporary new packet to store that buffer, frees the old packet, and replace it with the new packet. However, in doing so, it forgets about the side data, which gets freed, but is still needed and referenced. Then, when the packet gets freed again in the normal code path, it attempts to free its side data which has already been freed. Therefore, simply avoid the first free on side data by removing that side data from the packet. Fixes ticket #3773. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14Merge commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d'Michael Niedermayer
* commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d': avconv: rename output_packet() to process_input_packet() Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04ffmpeg: Do not fail if a demuxer and decoder use the same option identiferMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-15ffmpeg: Fix copying timebase to muxer contextMichael Niedermayer
Fixes Ticket3741 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-14ffmpeg: Use av_stream_get_parser() to avoid ABI issuesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-12ffmpeg: fix integer overflows with sub->*display_timeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09ffmpeg: remove common factors from copied timebaseMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'Michael Niedermayer
* commit '3f3232a371cc88696184d9aef1f812656264e56c': avconv: set the output stream timebase Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-02ffmpeg: check av_opt_set_dict() returnMichael Niedermayer
Fixes CID1224275 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27ffmpeg: fix deadlock regression in threading error handingSergey
Commit fc9c857c introduced deadlock regression when processing too many inputs: ffmpeg $(seq -f " -f lavfi -i aevalsrc=0:d=%.0f" 70) -vf concat=n=70:v=0:a=1 -f null - Happens for different number of inputs, depending on available memory size, overcommit settings, ulimits, etc. Easily noticeable for 32-bit builds, that exhaust address space allocating 8-10 MB stack for each thread. Earlier ffmpeg versions exited with unhelpful "Conversion failed!" message. This patch fixes both problems: it frees the queue to prevent deadlock and adds a meaningful error message if pthread_create() fails. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23ffmpeg: fix reinitializing with threads while flushingMichael Niedermayer
With threads the decoder has a delay and will thus have multiple frames at EOF left in its buffers which will be returned when flushing the decoder. The code that extracts such frames from the decoder at the end does not pull frames from the filtergraph, thus when one of these frames causes the filtergraph to be reinited, the frames still inside the graph at that point re lost This commit changes the flushing to be more similar to normal decoding and 1 frame at a time Fixes hqx fate with threads Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-22ffmpeg: fix transcoding dvbsub to dvbsubAnshul Maheshwari
fix ticket #2024 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-21ffmpeg: fix memleak and corruption of AVSubtitle with multiple outputsAnshul Maheshwari
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251'Michael Niedermayer
* commit '452860d7e056f9a894cac2fe52cdedeae4c38251': Use av_packet_rescale_ts() to simplify code. Conflicts: doc/examples/muxing.c ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-17Merge commit '71d6551e674c86d07c165439c2bf6613b3892307'Michael Niedermayer
* commit '71d6551e674c86d07c165439c2bf6613b3892307': avconv: use the correct variable in comparison Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-14ffmpeg: for h264 we need has_b_frames from the decoderMichael Niedermayer
Other solutions welcome Fixes Ticket3711 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-14ffmpeg: print values of mismatching has_b_framesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-14ffmpeg: Fix bitstream filters manipulating AVCodecContextMichael Niedermayer
Fixes Ticket3715 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-12Merge commit '48e50921337984ba4ec2c1cafe45d43787f84498'Michael Niedermayer
* commit '48e50921337984ba4ec2c1cafe45d43787f84498': avconv: make -shortest work with streamcopy Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 12:24:27 +0000