summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
* ffmpeg: Remove redundant null checkMichael Niedermayer2017-02-06
| | | | | | Fixes CID1396245 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Add a missing line break when requesting a sample.Carl Eugen Hoyos2017-02-02
|
* ffmpeg.c: Add output file index and stream index to vstats file.Sasi Inguva2017-01-27
| | | | | Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: pass output stream duration as a hint to the muxerTobias Rapp2017-01-19
| | | | | Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Add -time_base option to hint the time baseMichael Bradshaw2017-01-14
| | | | | Signed-off-by: Michael Bradshaw <mjbshaw@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: use buffersink accessors.Nicolas George2017-01-12
|
* ffmpeg: remove stop_encoding variable and related code, it is dead / unused codeMichael Niedermayer2016-12-28
| | | | | | | Fixes: CID1396243 Reviewed-by: compn <tempn@mi.rr.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Check avcodec_parameters_to_context() for failureMichael Niedermayer2016-12-26
| | | | | | Fixes CID1396241 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: assert return value is initializedTobias Rapp2016-12-01
| | | | | Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: factor out sending frame to filtersClément Bœsch2016-11-18
| | | | | Video doesn't exit ffmpeg on error anymore, and audio now prints an error.
* ffmpeg: remove dead code out of the video filter loopClément Bœsch2016-11-18
| | | | | | It makes no sense for this code to be inside the video filter loop, and the frame sample aspect ratio is even set unconditionally a few lines above.
* Merge commit 'b55566db4c51d920a6496455bb30a608e5a50a41'Hendrik Leppkes2016-11-14
|\ | | | | | | | | | | | | | | | | | | * commit 'b55566db4c51d920a6496455bb30a608e5a50a41': avconv: use avcodec_parameters_copy() with streamcopy The fate-aac-autobsf-adtstoasc changes from writing an audio bitdepth based on the sample format, which is now available. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | Merge commit '50722b4f0cbc5940e9e6e21d113888436cc89ff5'Hendrik Leppkes2016-11-13
|\| | | | | | | | | | | | | * commit '50722b4f0cbc5940e9e6e21d113888436cc89ff5': avconv: decouple configuring filtergraphs and setting output parameters Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | Merge commit 'ba7397baef796ca3991fe1c921bc91054407c48b'Hendrik Leppkes2016-11-13
|\| | | | | | | | | | | | | * commit 'ba7397baef796ca3991fe1c921bc91054407c48b': avconv: factor out initializing stream parameters for encoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | ffmpeg: add newline to avformat_write_header error messageMarton Balint2016-11-13
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffmpeg: don't overwrite av_bsf_receive_packet return value before checking itJames Almer2016-11-05
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | ffmpeg: Warn if thousands of frames are duplicated.Carl Eugen Hoyos2016-11-04
| | | | | | | | Fixes ticket #5193.
* | ffmpeg: Fix bsf corrupting merged side dataMichael Niedermayer2016-11-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '722ec3eb35bc152ce91d0a4502eca0df1c0086d0'Hendrik Leppkes2016-11-03
|\| | | | | | | | | | | | | * commit '722ec3eb35bc152ce91d0a4502eca0df1c0086d0': avconv: decouple configuring filtergraphs and setting input parameters Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | doc: fix spelling errorsAndreas Cadhalpun2016-10-21
| | | | | | | | | | | | | | | | 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>
* | ffmpeg: remove unused ist parameter in do_subtitle_out()Clément Bœsch2016-10-16
| |
* | ffmpeg: Use av_fifo_freep() to avoid stale pointersMichael Niedermayer2016-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg_cleanup: fix crash with unrecognized codecJames Zern2016-10-14
| | | | | | | | | | | | | | | | since: 3e5e5bd Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc' Signed-off-by: James Zern <jzern@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc'Hendrik Leppkes2016-10-08
|\| | | | | | | | | | | | | * commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc': avconv: buffer the packets written while the muxer is not initialized Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | ffmpeg: explicitly write headers for files with no streamsHendrik Leppkes2016-10-07
| | | | | | | | | | Recent changes to ffmpeg.c tied output file init to stream init, which broke stream-less files, specifically ffmetadata output.
* | Merge commit '1c169782cae6c5c430ff62e7d7272dc9d0e8d527'Hendrik Leppkes2016-10-07
|\| | | | | | | | | | | | | * commit '1c169782cae6c5c430ff62e7d7272dc9d0e8d527': avconv: explicitly postpone writing the header until all streams are initialized Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | Merge commit 'beb62dac629603eb074a44c44389c230b5caac7c'Hendrik Leppkes2016-10-07
|\| | | | | | | | | | | | | * commit 'beb62dac629603eb074a44c44389c230b5caac7c': Use AVFrame.pts instead of deprecated pkt_pts. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | ffmpeg: remove unused and errorneous AVFrame timestamp checkHendrik Leppkes2016-10-07
| | | | | | | | | | | | 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.
* | ffmpeg: don't reconfigure terminal if we're not taking input from stdinRodger Combs2016-10-06
| |
* | ffmpeg: use new encode APIwm42016-10-01
| |
* | ffmpeg: use new decode APIwm42016-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | ffmpeg: move subframe warning to libavcodecwm42016-10-01
| | | | | | | | | | | | | | | | | | | | | | 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.
* | ffmpeg: pass the hwaccel frames context to the decoderAnton Khirnov2016-09-29
| |
* | Merge commit '6ed0f70f97c882813199b3bafd724ceeb43659de'James Almer2016-09-28
|\| | | | | | | | | | | | | | | | | | | * commit '6ed0f70f97c882813199b3bafd724ceeb43659de': avconv: factor out initializing stream parameters for streamcopy Conflicts: ffmpeg.c Merged-by: James Almer <jamrial@gmail.com>
* | ffmpeg: stop using AVStream.codec on stream copyJames Almer2016-09-27
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | ffmpeg: fix memleak of encoder options AVDictionary on failureJames Almer2016-09-25
| | | | | | | | | | Reviewed-by: Josh de Kock <josh@itanimul.li> Signed-off-by: James Almer <jamrial@gmail.com>
* | ffmpeg: Fix bistream typosMichael Niedermayer2016-09-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: switch to the new BSF APIClément Bœsch2016-09-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | ffmpeg: switch to codecparClément Bœsch2016-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | lavf: add avformat_transfer_internal_stream_timing_info() and use it in ffmpegClément Bœsch2016-09-14
| | | | | | | | | | 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.
* | ffmpeg: copy trailing_padding when using -acodec copyJon Toohill2016-09-13
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | ffmpeg: fix broken indent/style in write_frameClément Bœsch2016-09-02
| |
* | ffmpeg: fix -stream_loop with -reMarton Balint2016-08-28
| | | | | | | | | | | | | | Otherwise the stream failed with EAGAIN. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffmpeg: Do not set too large bits_per_raw_sample.Carl Eugen Hoyos2016-08-17
| |
* | cmdutils: remove the current working directory from the DLL search path on win32Hendrik Leppkes2016-08-08
| | | | | | | | | | Reviewed-by: Matt Oliver <protogonoi@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '90944ee3ab79081845ea1bd97eea475031ce0842'James Almer2016-08-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '90944ee3ab79081845ea1bd97eea475031ce0842': avconv: refactor selecting an encoder Conflicts: ffmpeg.c ffmpeg_opt.c Merged-by: James Almer <jamrial@gmail.com>
* | Merge commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae'Timothy Gu2016-08-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into mergeTimothy Gu2016-08-03
|\| | | | | | | | | | | | | * commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee': avconv: create simple filtergraphs earlier Merged-by: Timothy Gu <timothygu99@gmail.com>
* | Merge commit '49670e4218d34899a1c37abb7a11615efc16f757'Timothy Gu2016-08-03
|\| | | | | | | | | | | | | | | | | | | * commit '49670e4218d34899a1c37abb7a11615efc16f757': avconv: add a function for determining whether a filtergraph is simple Conflicts: avconv.c Merged-by: Timothy Gu <timothygu99@gmail.com>
* | ffmpeg.c: copy video profile when using stream_copyMark Reid2016-07-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 13:21:56 +0000