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
2016-10-22doc: fix spelling errorsAndreas Cadhalpun
Thanks to Mathieu Malaterre <malat@debian.org> for reporting the Que/Queue typo. (https://bugs.debian.org/839542) Reviewed-by: Lou Logan <lou@lrcd.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2016-10-16ffmpeg: remove unused ist parameter in do_subtitle_out()Clément Bœsch
2016-10-14ffmpeg: Use av_fifo_freep() to avoid stale pointersMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-10-14ffmpeg_cleanup: fix crash with unrecognized codecJames Zern
since: 3e5e5bd Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc' Signed-off-by: James Zern <jzern@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-10-08Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc'Hendrik Leppkes
* commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc': avconv: buffer the packets written while the muxer is not initialized Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-10-07ffmpeg: explicitly write headers for files with no streamsHendrik Leppkes
Recent changes to ffmpeg.c tied output file init to stream init, which broke stream-less files, specifically ffmetadata output.
2016-10-07Merge commit '1c169782cae6c5c430ff62e7d7272dc9d0e8d527'Hendrik Leppkes
* commit '1c169782cae6c5c430ff62e7d7272dc9d0e8d527': avconv: explicitly postpone writing the header until all streams are initialized Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-10-07Merge commit 'beb62dac629603eb074a44c44389c230b5caac7c'Hendrik Leppkes
* commit 'beb62dac629603eb074a44c44389c230b5caac7c': Use AVFrame.pts instead of deprecated pkt_pts. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-10-07ffmpeg: remove unused and errorneous AVFrame timestamp checkHendrik Leppkes
Decoders have previously not used AVFrame.pts, and with the upcoming deprecation of pkt_pts (in favor of pts), this would lead to an errorneous interpration of timestamps.
2016-10-07ffmpeg: don't reconfigure terminal if we're not taking input from stdinRodger Combs
2016-10-01ffmpeg: use new encode APIwm4
2016-10-01ffmpeg: use new decode APIwm4
This is a bit messy, mainly due to timestamp handling. decode_video() relied on the fact that it could set dts on a flush/drain packet. This is not possible with the old API, and won't be. (I think doing this was very questionable with the old API. Flush packets should not contain any information; they just cause a FIFO to be emptied.) This is replaced with checking the best_effort_timestamp for AV_NOPTS_VALUE, and using the suggested DTS in the drain case. The modified tests (fate-cavs and others) still fails due to dropping the last frame. This happens because the timestamp of the last frame goes backwards (ffprobe -show_frames shows the same thing). I suspect that this "worked" due to the best effort timestamp logic picking the DTS over the decreasing PTS. Since this logic is in libavcodec (where it probably shouldn't be), this can't be easily fixed. The timestamps of the cavs samples are weird anyway, so I chose not to fix it. Another strange thing is the timestamp handling in the video path of process_input_packet (after the decode_video() call). It looks like the code to increase next_dts and next_pts should be run every time a frame is decoded - but it's needed even if output is skipped.
2016-10-01ffmpeg: move subframe warning to libavcodecwm4
With the new decode API, doing this in ffmpeg.c is impractical. There was resistance against removing the warning, so put it into libavcodec. Not bothering with reducing the warning to verbose log level for subsequent wanrings. The warning should be rare, and only happen when developing new codecs for the old API. Includes a change suggested by Michael Niedermayer.
2016-09-29ffmpeg: pass the hwaccel frames context to the decoderAnton Khirnov
2016-09-28Merge commit '6ed0f70f97c882813199b3bafd724ceeb43659de'James Almer
* commit '6ed0f70f97c882813199b3bafd724ceeb43659de': avconv: factor out initializing stream parameters for streamcopy Conflicts: ffmpeg.c Merged-by: James Almer <jamrial@gmail.com>
2016-09-27ffmpeg: stop using AVStream.codec on stream copyJames Almer
This commit is based on commit 35c8580 from Anton Khirnov <anton@khirnov.net> which was skipped in b8945c4. The avcodec_copy_context() call in the encode path is left in place for now as AVStream.codec is apparently still required even after porting ffmpeg to the new bsf API. Tested-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2016-09-25ffmpeg: fix memleak of encoder options AVDictionary on failureJames Almer
Reviewed-by: Josh de Kock <josh@itanimul.li> Signed-off-by: James Almer <jamrial@gmail.com>
2016-09-25ffmpeg: Fix bistream typosMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-09-24ffmpeg: switch to the new BSF APIClément Bœsch
This commit is initially largely based on commit 4426540 from Anton Khirnov <anton@khirnov.net> and two following fixes (80fb19b and fe7b21c) which were previously skipped respectively in 98e3153, c9ee36e, and 7fe7cdc. mpeg4-bsf-unpack-bframes FATE reference is updated because the bsf filter now actually fixes the extradata (mpeg4_unpack_bframes_init() changing one byte is now honored on the output extradata). The FATE references for remove_extra change because the packet flags were wrong and the keyframes weren't marked, causing the bsf relying on these proprieties to not actually work as intended. The following was fixed by James Almer: The filter option arguments are now also parsed correctly. A hack to propagate extradata changed by bitstream filters after the first av_bsf_receive_packet() call is added to maintain the current behavior. This was previously done by av_bitstream_filter_filter() and is needed for the aac_adtstoasc bsf. The exit_on_error was not being checked anymore, and led to an exit error in the last frame of h264_mp4toannexb test. Restoring this behaviour prevents erroring out. The test is still changed as a result due to the badly filtered frame now not being written after the failure. Signed-off-by: Clément Bœsch <u@pkh.me> Signed-off-by: James Almer <jamrial@gmail.com>
2016-09-21ffmpeg: switch to codecparClément Bœsch
This commit is largely based on commit 15e84ed3 from Anton Khirnov <anton@khirnov.net> which was previously skipped in bbf5ef9d. There are still a bunch of things raising codecpar related warnings that need fixing, such as: - the use of codec->debug in the interactive debug mode - read_ffserver_streams(): it's probably broken now but there is no test - lowres stuff - codec copy apparently required by bitstream filters The matroska references are updated because they now properly forward the field_order (previously unknown, now progressive). Thanks to James Almer for fixing a bunch of FATE issues in this commit. Signed-off-by: Clément Bœsch <clement@stupeflix.com> Signed-off-by: James Almer <jamrial@gmail.com>
2016-09-14lavf: add avformat_transfer_internal_stream_timing_info() and use it in ffmpegClément Bœsch
In lavf we have access to st->internal->avctx so it's a better place than in ffmpeg*.c and will allow moving to codecpar.
2016-09-14ffmpeg: copy trailing_padding when using -acodec copyJon Toohill
Signed-off-by: James Almer <jamrial@gmail.com>
2016-09-02ffmpeg: fix broken indent/style in write_frameClément Bœsch
2016-08-28ffmpeg: fix -stream_loop with -reMarton Balint
Otherwise the stream failed with EAGAIN. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
2016-08-17ffmpeg: Do not set too large bits_per_raw_sample.Carl Eugen Hoyos
2016-08-08cmdutils: remove the current working directory from the DLL search path on win32Hendrik Leppkes
Reviewed-by: Matt Oliver <protogonoi@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-06Merge commit '90944ee3ab79081845ea1bd97eea475031ce0842'James Almer
* commit '90944ee3ab79081845ea1bd97eea475031ce0842': avconv: refactor selecting an encoder Conflicts: ffmpeg.c ffmpeg_opt.c Merged-by: James Almer <jamrial@gmail.com>
2016-08-04Merge commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae'Timothy Gu
* commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae': avconv: fix handling attachments in init_output_stream Conflicts: avconv.c This is functionally a no-op, as we don't have the bug this is trying to fix. See 843be56ee18928ecf80bcb20d235c4f9cab5a8fd. Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-04Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into mergeTimothy Gu
* commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee': avconv: create simple filtergraphs earlier Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-04Merge commit '49670e4218d34899a1c37abb7a11615efc16f757'Timothy Gu
* commit '49670e4218d34899a1c37abb7a11615efc16f757': avconv: add a function for determining whether a filtergraph is simple Conflicts: avconv.c Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-07-23ffmpeg.c: copy video profile when using stream_copyMark Reid
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-07-17cosmetics: fix some misspelled wordsJames Almer
Signed-off-by: James Almer <jamrial@gmail.com>
2016-06-25ffmpeg: do not use deprecated AVSubtitleRect.pictClément Bœsch
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-06-10ffmpeg: Add cuvid hwaccel supportTimo Rothenpieler
2016-05-16ffmpeg: Check that r_frame_rate is set before attempting to use itMichael Niedermayer
Avoids unexpected occurance and dependency on NaN behavior and divisions by 0 Testcase: fate-lavf-fate-avi_cram Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-05-10ffmpeg: copy color properties in case of -c:v copy.Ronald S. Bultje
I have no idea why the first hunk uses ost->enc_ctx, because as far as I understand, that is never used in case of -c:v copy, but this code block is only entered if encoding_needed=0, which means stream_copy=1. My point being: review from someone that knows this really well would be appreciated.
2016-05-09Merge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f'Derek Buitenhuis
* commit '5d273d3efac340ef8de445c955ff44c7abed4e8f': avconv: VAAPI hwcontext initialisation and hwaccel helper Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-10Merge commit '9200514ad8717c63f82101dc394f4378854325bf'Derek Buitenhuis
* commit '9200514ad8717c63f82101dc394f4378854325bf': lavf: replace AVStream.codec with AVStream.codecpar This has been a HUGE effort from: - Derek Buitenhuis <derek.buitenhuis@gmail.com> - Hendrik Leppkes <h.leppkes@gmail.com> - wm4 <nfxjfg@googlemail.com> - Clément Bœsch <clement@stupeflix.com> - James Almer <jamrial@gmail.com> - Michael Niedermayer <michael@niedermayer.cc> - Rostislav Pehlivanov <atomnuker@gmail.com> Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-03-11vp9: add superframe merging bitstream filter.Ronald S. Bultje
Fixes ticket 4313.
2016-03-11lavf: allow BSFs to drop packets.Ronald S. Bultje
If pkt->size == 0 && pkt->side_data_elems == 0 after bsf->filter() returns, the packet is considered dropped.
2016-02-26ffmpeg: set sub_text_format to ass (without timing) by defaultClément Bœsch
Fixes Ticket #4783
2016-02-24Merge commit 'c15f6098b1b25689dd5e86aeb5ce69bc12efe1e1'Derek Buitenhuis
* commit 'c15f6098b1b25689dd5e86aeb5ce69bc12efe1e1': avconv: pass the hw context from filters to the encoder Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-19ffmpeg: init input streams before opening encodersMarton Balint
Codec options of streams detected during avformat_find_stream_info are not set therefore without this patch we initialize the encoders with decoder info based on decoders without options. This cause problems for probed DVB teletext streams where avctx->subtitle_header depend on the txt_format setting. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
2016-02-18ffmpeg: Check best_effort_timestamp after rescaleMichael Niedermayer
Fixes integer overflow Fixes: Ticket5126 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-01-29ffmpeg: replace "flush Media" with "flush_media" in benchmark_all outputStefano Sabatini
Simplify parsing and consistency.
2016-01-19Merge commit '63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2'Hendrik Leppkes
* commit '63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2': avconv: Drop an impossible check Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-01-19Merge commit '7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2'Hendrik Leppkes
* commit '7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2': avconv: Simplify poll_filters() return value check Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-01-17ffmpeg: fix sws_dict leak on error exitMichael Niedermayer
Fixes: 1b79b985cdf860ffa228c00ee5497051/signal_sigsegv_1f99d24_3549_86d92054a79f6ff900fbaf03f8012b32.aif Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-01-08ffmpeg: check fclose return valuesGanesh Ajjanagadde
In the spirit of commit a956840cbc. Simple method to reproduce: pass -vstats_file /dev/full to ffmpeg. All raw fclose usages in ffmpeg.c taken care of here. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-06 02:17:30 +0300