summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
* ffmpeg: use intermediary variables in reap_filters, increase readabilityStefano Sabatini2014-01-26
|
* ffmpeg: use av_err2str() macroStefano Sabatini2014-01-23
| | | | Simplify.
* ffmpeg: apply misc cosmetics to process_input() codeStefano Sabatini2014-01-23
|
* ffmpeg: change ost->finished to an enumMichael Niedermayer2014-01-17
| | | | | Idea-by: ramiro Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: update statistics only when a packet is actually muxedMichael Niedermayer2014-01-17
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg/flush_encoders: dont mux packets once ost->finished has been setMichael Niedermayer2014-01-17
| | | | | | Fixes muxing frames after av_interleaved_write_frame() failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: properly close down muxers on av_interleaved_write_frame() failureMichael Niedermayer2014-01-17
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: check ost->finished in check_output_constraints()Michael Niedermayer2014-01-17
| | | | | | No testcase but it seems logic to stop when finished is set Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: check ost->finished in reap_filters()Michael Niedermayer2014-01-17
| | | | | | This avoids finished output streams continuing to receive frames Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683'Michael Niedermayer2014-01-17
|\ | | | | | | | | | | | | | | | | | | * commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683': avconv: print a warning when falling back to default 25fps Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use timestamp from before and after the decoder to detect backward ↵Michael Niedermayer2013-12-22
| | | | | | | | | | | | | | | | | | | | | | | | moving dts for discontinuity detection This should make discontinuity detection more robust and detect more cases. Timestamps after the decoder can be delayed due to threads, timestamps before can be missing no testcase available/known Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | remuxing .opus files to .webm codec->delay must be copied tooJan Gerber2013-12-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '674fa49110a661694188a958be13d529b7c8c5dd'Michael Niedermayer2013-12-11
|\| | | | | | | | | | | | | | | | | | | * commit '674fa49110a661694188a958be13d529b7c8c5dd': avconv: do not call avcodec_get_frame_defaults() Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9'Michael Niedermayer2013-12-11
|\| | | | | | | | | | | | | | | | | | | * commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9': Replace all uses of avcodec_free_frame with av_frame_free(). Conflicts: doc/examples/decoding_encoding.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero durationMarton Balint2013-11-28
| | | | | | | | | | | | | | | | | | | | | | | | | | When fix_sub_duration is used, and the duration fixing code is generating 0 duration, that is definitely zero, and not undefined or infinite (which may be the case for decoded AVSubtitles depending on the codec), so it is safe to drop it. It fixes teletext subtitle sources, when the subtitles are transmitted twice after each other for some reason. Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Nicolas George <george@nsup.org>
* | ffmpeg: free empty subtitles as well in transcode_subtitlesMarton Balint2013-11-28
| | | | | | | | | | | | | | | | | | Even if it does not matter at the moment, because subtitles with num_rect == 0 have no memory allocated, this is how we expect the users to use the API, a returned AVSubtitle should be freed with avsubtitle_free. Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Nicolas George <george@nsup.org>
* | ffmpeg: do not pass possibly undefined subtitles to sub2video_updateMarton Balint2013-11-28
| | | | | | | | | | | | | | It should not matter for real-life usage, it is just cleaner this way. Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Nicolas George <george@nsup.org>
* | ffmpeg: set VCFR when copying timestampsMichael Niedermayer2013-11-28
| | | | | | | | | | | | | | This fixes unreasonable initial frame repeats Fixes Ticket3176 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'Michael Niedermayer2013-11-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '07fd0a22192805d56c635eb294dc26b0a54ae325': avconv: add infrastructure for using hwaccels Conflicts: ffmpeg.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils&ffmpeg: use av_fopen_utf8() for passlogfileMichael Niedermayer2013-11-21
| | | | | | | | | | | | might fix Ticket3056 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix do_streamcopy() so it copies side data tooMichael Niedermayer2013-11-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'Michael Niedermayer2013-11-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5b9c3b4505206143d85398c1410949319fa1180f': Replace all instances of avcodec_alloc_frame() with av_frame_alloc(). Conflicts: doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c libavcodec/alacenc.c libavcodec/libopenjpegenc.c libavcodec/libvpxenc.c libavcodec/pcm.c libavcodec/xbmenc.c libavcodec/xwdenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Do not fill gap before the first decodable frame on single stream ↵Michael Niedermayer2013-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | input files unless the user explicitly requests it. Fixes different behavior to JM and probably several if not all reference decoders. We cannot just do this unconditionally as it would ruin AV sync in some use cases. Bug-Found-by: BugMaster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: remove unneeded include "libswscale/swscale.h"Michael Niedermayer2013-11-10
| | | | | | | | | | Found-by: ramiro Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: treat avi as VFR in framerate conversion codeMichael Niedermayer2013-11-09
| | | | | | | | | | | | | | | | | | It can be debated if avi is vfr or cfr, it can be either depending on the definition of vfr and cfr. This commit ensures that avi is treated correctly independent of the AVFMT_VARIABLE_FPS value. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ccc71298456d97f64f539e303c771d04dcb33c53'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | * commit 'ccc71298456d97f64f539e303c771d04dcb33c53': lavc: deprecate FF_DEBUG_MV and remove all traces of its use Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'Michael Niedermayer2013-10-29
|\| | | | | | | | | | | | | | | | | | | * commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29': avconv: stop accessing AVStream.parser Conflicts: ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ddc589ce98c2bba1e59318b5b0224717325eac46'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | * commit 'ddc589ce98c2bba1e59318b5b0224717325eac46': avconv: drop a now useless variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: make stream default if its the only of its kind and no source can be ↵Michael Niedermayer2013-10-25
| | | | | | | | | | | | | | | | unambigously assigned to it Fixes Ticket2969 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Dont crash on unconnected output pads before an error is printedMichael Niedermayer2013-10-23
| | | | | | | | | | Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: set the source_index for trivial filter graphsMichael Niedermayer2013-10-11
| | | | | | | | | | | | Fixes one testcase in Ticket2969 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: add max_error_rate to allow tuning the point decoding errors are ↵Michael Niedermayer2013-10-07
| | | | | | | | | | | | | | considered a failure of the whole transcoding. Suggested-by: Daemon404 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: dont detect slight (0.1sec) backward moving dts as discontinuityMichael Niedermayer2013-10-07
| |
* | ffmpeg: dont return reserved valuesMichael Niedermayer2013-10-02
| | | | | | | | | | Found-by: Daemon404 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: check for unsupported "queing of command on first filter supporting ↵Michael Niedermayer2013-09-10
| | | | | | | | | | | | the specific commend" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: improve built in docs for passing commandsMichael Niedermayer2013-09-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: print command replies starting on column 0Michael Niedermayer2013-09-10
| | | | | | | | | | | | This fixes formating issues with multi-line replies Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Warn the user if a pix_fmt != yuv420p was chosen for MPEG-2 video encoding.Carl Eugen Hoyos2013-08-18
| | | | | | | | Fixes ticket #2870.
* | Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '488a0fa68973d48e264d54f1722f7afb18afbea7': avconv: support -t as an input option. Conflicts: Changelog ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8': avconv: distinguish between -ss 0 and -ss not being used Conflicts: ffmpeg.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: raise level for message printed in case of auto-select pixel formatStefano Sabatini2013-08-01
| | | | | | | | | | | | | | Increase visibility, in order to decrease troubleshooting for users generating non playable H.264 content. Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* | Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'Michael Niedermayer2013-07-08
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '636ced8e1dc8248a1353b416240b93d70ad03edb': cmdutils: wrap exit explicitly Conflicts: avprobe.c cmdutils.c ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Don't include colorspace.hDerek Buitenhuis2013-06-29
| | | | | | | | | | | | | | The header is private, and ffmpeg.c doesn't use it for anything. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790'Michael Niedermayer2013-06-23
|\| | | | | | | | | | | | | * commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790': avconv: report the error for codec open failure Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f'Michael Niedermayer2013-06-23
|\| | | | | | | | | | | | | * commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f': avconv: drop additional strerror fallback Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c'Michael Niedermayer2013-06-05
|\| | | | | | | | | | | | | | | | | | | * commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c': avconv: check that the output format context exists before accessing it Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: ignore EOF when pushing frames to filters.Nicolas George2013-06-02
| | | | | | | | | | | | | | EOF is not a fatal condition, it is normally produced by a few filters. TODO: take it into account to avoid useless decoding.
* | ffmpeg: use actual packet pts when discarding for the copypriorss optionJustin Ruggles2013-05-28
| | | | | | | | | | | | | | | | | | The ist->pts value at this point does not necessarily match the actual packet pts, which is what should be used to decide whether to discard the packet. Without this change, some video packets that have pts on or after the start time are getting discarded when they should not be. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '538bf767373f176b6487e30181155e74b37cced6'Michael Niedermayer2013-05-28
|\| | | | | | | | | | | | | | | | | | | | | * commit '538bf767373f176b6487e30181155e74b37cced6': avconv: make -aspect work with streamcopy Conflicts: ffmpeg.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>