summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
* Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8'Michael Niedermayer2014-09-27
|\ | | | | | | | | | | | | | | | | | | * commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8': avconv: Use only audio and video to guess discontinuities Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: replace impossible dts/pts combinations by a reasonable guess ↵Michael Niedermayer2014-09-23
| | | | | | | | | | | | | | | | instead of hard failing Fixes stream copy from tserror270.ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph ↵Michael Niedermayer2014-09-11
| | | | | | | | | | | | | | | | not just when changing audio resample parameters Fixes Ticket3562 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Copy extradata if it has been initialized later from the encoderMichael Niedermayer2014-09-07
| | | | | | | | | | | | Fixes Ticket3909 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Enable compute_edt only when the subtitles are used for a output ↵Michael Niedermayer2014-09-01
| | | | | | | | | | | | | | | | | | stream instead of a filter Fixes/works around Ticket3768 Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dvbsubdec: make compute_edt user settableMichael Niedermayer2014-09-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Fix missing {} in Stream to Packet side data codeMichael Niedermayer2014-08-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Drop remaining unneeded != NULLMichael Niedermayer2014-08-15
| | | | | | | | | | Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | ffmpeg: remove 32 channel limit from audio_channels_mapMichael Niedermayer2014-08-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix streamcopy with side dataChristophe Gisquet2014-08-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d'Michael Niedermayer2014-08-14
|\| | | | | | | | | | | | | | | | | | | * commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d': avconv: rename output_packet() to process_input_packet() Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Do not fail if a demuxer and decoder use the same option identiferMichael Niedermayer2014-08-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Fix copying timebase to muxer contextMichael Niedermayer2014-07-15
| | | | | | | | | | | | Fixes Ticket3741 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Use av_stream_get_parser() to avoid ABI issuesMichael Niedermayer2014-07-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix integer overflows with sub->*display_timeMichael Niedermayer2014-07-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: remove common factors from copied timebaseMichael Niedermayer2014-07-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | | | | | | | * commit '3f3232a371cc88696184d9aef1f812656264e56c': avconv: set the output stream timebase Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: check av_opt_set_dict() returnMichael Niedermayer2014-07-02
| | | | | | | | | | | | Fixes CID1224275 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix deadlock regression in threading error handingSergey2014-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | ffmpeg: fix reinitializing with threads while flushingMichael Niedermayer2014-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | ffmpeg: fix transcoding dvbsub to dvbsubAnshul Maheshwari2014-06-22
| | | | | | | | | | | | fix ticket #2024 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix memleak and corruption of AVSubtitle with multiple outputsAnshul Maheshwari2014-06-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251'Michael Niedermayer2014-06-20
|\| | | | | | | | | | | | | | | | | | | | | * commit '452860d7e056f9a894cac2fe52cdedeae4c38251': Use av_packet_rescale_ts() to simplify code. Conflicts: doc/examples/muxing.c ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '71d6551e674c86d07c165439c2bf6613b3892307'Michael Niedermayer2014-06-17
|\| | | | | | | | | | | | | * commit '71d6551e674c86d07c165439c2bf6613b3892307': avconv: use the correct variable in comparison Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: for h264 we need has_b_frames from the decoderMichael Niedermayer2014-06-14
| | | | | | | | | | | | | | | | Other solutions welcome Fixes Ticket3711 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: print values of mismatching has_b_framesMichael Niedermayer2014-06-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Fix bitstream filters manipulating AVCodecContextMichael Niedermayer2014-06-14
| | | | | | | | | | | | Fixes Ticket3715 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '48e50921337984ba4ec2c1cafe45d43787f84498'Michael Niedermayer2014-06-12
|\| | | | | | | | | | | | | | | | | | | * commit '48e50921337984ba4ec2c1cafe45d43787f84498': avconv: make -shortest work with streamcopy Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: prevent pts < dts to be passed through to the muxer on stream copyMichael Niedermayer2014-06-05
| | | | | | | | | | | | Fixes Ticket3658 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '39ec5e1cf8444f827c42effb76e5694e091bbff3'Michael Niedermayer2014-06-04
|\| | | | | | | | | | | | | * commit '39ec5e1cf8444f827c42effb76e5694e091bbff3': avconv: Report the codec and the encoder separately Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | fix various typosLou Logan2014-06-03
| | | | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: try to use the more fitting of the 2 encoder contextsMichael Niedermayer2014-06-03
| | | | | | | | | | | | This fixes the interactively enabled encoder debug by pressing 'D' Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use av_log_ask_for_sample() instead of duplicating ↵Michael Niedermayer2014-06-03
| | | | | | | | avpriv_request_sample()
* | Loose mplayer in MPlayer/incoming/Michael Niedermayer2014-06-03
| | | | | | | | | | Found-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add direct link to ML in missing_feature_sample()Michael Niedermayer2014-06-03
| | | | | | | | | | Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: request sample if the decoder & demuxer has_b_frames mismatchMichael Niedermayer2014-06-03
| | | | | | | | | | | | | | 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>
* | ffmpeg: remove "has_b_frames" backpassingMichael Niedermayer2014-06-03
| | | | | | | | | | | | | | | | 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>
* | ffmpeg: Fix encoder names in printoutMichael Niedermayer2014-06-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix for-muxer AVCodecContext stuffMichael 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>
* | ffmpeg: add note about why has_b_frame is copied and when it can be removedMichael Niedermayer2014-06-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: replace remaining, ffmpeg specific ist->st->codec by ist->dec_ctxMichael Niedermayer2014-06-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: copy b frame codec delay back from decoder to demuxerMichael Niedermayer2014-06-01
| | | | | | | | | | | | | | | | | | 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>
* | 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: fix check for muxing overhead being unknownMichael Niedermayer2014-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use thread message API.Nicolas George2014-05-26
| |
* | 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/set_encoder_id: dont allocate encoder string if one is already setMichael Niedermayer2014-05-20
| | | | | | | | | | | | Fixes memleak Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use av_fifo_alloc_arrayLukasz Marek2014-05-20
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 11:40:29 +0000