Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/ffmpeg.c
AgeCommit message (Collapse)Author
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-15ffmpeg: 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-15ffmpeg: 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>
2014-06-05ffmpeg: prevent pts < dts to be passed through to the muxer on stream copyMichael Niedermayer
Fixes Ticket3658 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-04Merge commit '39ec5e1cf8444f827c42effb76e5694e091bbff3'Michael Niedermayer
* commit '39ec5e1cf8444f827c42effb76e5694e091bbff3': avconv: Report the codec and the encoder separately Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03fix various typosLou Logan
Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03ffmpeg: try to use the more fitting of the 2 encoder contextsMichael Niedermayer
This fixes the interactively enabled encoder debug by pressing 'D' Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03ffmpeg: use av_log_ask_for_sample() instead of duplicating ↵Michael Niedermayer
avpriv_request_sample()
2014-06-03Loose mplayer in MPlayer/incoming/Michael Niedermayer
Found-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03Add direct link to ML in missing_feature_sample()Michael Niedermayer
Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03ffmpeg: request sample if the decoder & demuxer has_b_frames mismatchMichael Niedermayer
We cannot use avpriv_request_sample() as this is private to the libs or rather it would be a bad usage example Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03ffmpeg: remove "has_b_frames" backpassingMichael Niedermayer
It seems working without this now for the files i tested it with, if this causes a regression, dont hesitate to put the line back or open a ticket or fix (if possible) the parser Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01ffmpeg: Fix encoder names in printoutMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01ffmpeg: fix for-muxer AVCodecContext stuffMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d'Michael Niedermayer
* 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-01ffmpeg: add note about why has_b_frame is copied and when it can be removedMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01ffmpeg: replace remaining, ffmpeg specific ist->st->codec by ist->dec_ctxMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01ffmpeg: copy b frame codec delay back from decoder to demuxerMichael Niedermayer
The demuxer needs this value to generate correct timestamps in some corner cases Ideally the parser would always set this correctly, but some parsers lac support for extracting this value, also its not trivial. This fixes a regression Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'Michael Niedermayer
* 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-05-30ffmpeg: fix check for muxing overhead being unknownMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-26ffmpeg: use thread message API.Nicolas George
2014-05-21ffmpeg: use av_stream_get_end_pts()Michael Niedermayer
Simplifies code and should correct timing values when -*sync drop is used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20ffmpeg/set_encoder_id: dont allocate encoder string if one is already setMichael Niedermayer
Fixes memleak Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20ffmpeg: use av_fifo_alloc_arrayLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-19ffmpeg/do_video_stats: fix used timebaseMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19ffmpeg: set dts for subtitlesMichael Niedermayer
dts is not optional, its required for muxing, previously it was set from AVStream.pts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19ffmpeg: add last_mux_dts_plus_durationMichael Niedermayer
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-19Merge commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0'Michael Niedermayer
* commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0': avconv: do not use poorly defined and undocumented AVStream.pts Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19ffmpeg: Use av_gettime_relative()Olivier Langlois
Whenever av_gettime() is used to measure relative period of time, av_gettime_relative() is prefered as it guarantee monotonic time on supported platforms. Signed-off-by: Olivier Langlois <olivier@trillion01.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19ffmpeg: prefix encoder with "Lavc " in bitexact modeMichael Niedermayer
This avoids misleading encoder names like "encoder = prores" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19ffmpeg: Skip writing the version when -flags bitexact is usedMichael Niedermayer
Alternatively every fate test could be changed to pass both fflags and flags +bitexact Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-18Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'Michael Niedermayer
* commit '6656370b858329ca07a60a2de954d5e90daa0206': avconv: set the "encoder" tag when transcoding Conflicts: ffmpeg.c tests/ref/lavf/mkv tests/ref/seek/lavf-mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-18Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'Michael Niedermayer
* commit '93afb6c98df876b15e3d911a9450ad55f92080ce': avconv: set output avg_frame_rate when known Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-08 17:46:31 +0300