summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
* Remove recording_time check which is no longer necessary after r21687.Wolfram Gloger2010-02-11
| | | | | | Patch by Wolfram Gloger, wmglo A dent D med D uni-muenchen D de Originally committed as revision 21760 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use av_compare_ts to compare against the -t end time instead of usingReimar Döffinger2010-02-10
| | | | | | | | floating point. Should fix different results between PPC and x86 for the idroq-video-encode FATE test. Originally committed as revision 21745 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Stop reading input file when -t option value is reached.Wolfram Gloger2010-02-08
| | | | | | Patch by Wolfram Gloger wmglo (chez) dent med uni (minus) muenchen de Originally committed as revision 21687 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Revert r21615 | cehoyos | 2010-02-02 23:23:09 +0100 (Tue, 02 Feb 2010) | 5 ↵Justin Johnson2010-02-06
| | | | | | | | | | | | | | lines Guess the duration before converting video and write guessed duration into flv header. Patch by Justin Johnson, justin D johnson3 A gmail The change to ffmpeg.c is wrong as input and output files arent connected 1:1 (i seem to have missed that) Also it can segfault see ([FFmpeg-devel] rtp streaming x264+audio issues (and some ideas to fix them)) Originally committed as revision 21652 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add parentheses in boolean expression: (A && B || C) => ((A && B) || C),Stefano Sabatini2010-02-06
| | | | | | | | fix the warning: ffmpeg.c: In function ‘output_packet’: ffmpeg.c:1317: warning: suggest parentheses around && within || Originally committed as revision 21650 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make opt_frame_pix_fmt() call show_pix_fmts() if the provided optionStefano Sabatini2010-02-03
| | | | | | is "list". Originally committed as revision 21628 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Correct opts calulation in ffmpeg.c.Michael Niedermayer2010-02-03
| | | | | | | | | | This correct the stop point for demuxing with -vcodec copy and -t as well as packet interleaving. (we already diddrop packets but kept demuxing them for too long due to opts being wrong) the change to ffm is due to 2 packets with timestamp 0 being stored in different order. Originally committed as revision 21626 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Alternative solution for the mpegvideo_split + mov problem.Michael Niedermayer2010-02-03
| | | | Originally committed as revision 21625 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Guess the duration before converting video and write guessed durationJustin Johnson2010-02-02
| | | | | | | | into flv header. Patch by Justin Johnson, justin D johnson3 A gmail Originally committed as revision 21615 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check pkt.pts against the recording time.Michael Niedermayer2010-02-01
| | | | | | This fixes at least ogg encoding with -t where the file was slightly too long. Originally committed as revision 21598 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use av_get_pix_fmt() instead of the deprecated avcodec_get_pix_fmt()Stefano Sabatini2010-01-30
| | | | | | function. Originally committed as revision 21550 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffmpeg.c : Don't set AVFormatParameters::[audio|video]_codec_idJai Menon2010-01-28
| | | | | | since it is no longer required. Originally committed as revision 21513 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffmpeg.c : Increase static limit on the maximum number ofJai Menon2010-01-27
| | | | | | input files. Originally committed as revision 21483 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Print "Multiple frames in a packet" warning independant of CODEC_CAP_SUBFRAMESMichael Niedermayer2010-01-27
| | | | | | | because CODEC_CAP_SUBFRAMES is primarely misused to hide this warning otherwise which renders the flag completely useless. Originally committed as revision 21480 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix heap overflow with -async.Michael Niedermayer2010-01-23
| | | | | | Fixes issue1666 Originally committed as revision 21390 to svn://svn.ffmpeg.org/ffmpeg/trunk
* IndentMåns Rullgård2010-01-20
| | | | Originally committed as revision 21359 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Always call avcodec_thread_init()Måns Rullgård2010-01-20
| | | | | | | | | The various avcodec_thread_init() functions are updated to return immediately after setting avctx->thread_count. This allows -threads 0 to pass through to codecs. It also simplifies the usage for apps using libavcodec. Originally committed as revision 21358 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add -timelimit optionMåns Rullgård2010-01-20
| | | | | | | | | | | | | This option limits the CPU time used by ffmpeg to the number of seconds specified. After this time, the OS sends a SIGXCPU signal, which we handle and attempt to exit cleanly. If the process is stuck, the OS will deliver a SIGKILL one second later, forcibly terminating the process. This functionality is useful in automated setups where a runaway ffmpeg process would otherwise go undetected. Originally committed as revision 21347 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix stream copy & transcoding one stream at the same time.Michael Niedermayer2010-01-07
| | | | | | Fixes issue1660. Originally committed as revision 21042 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Correct indention.Michael Niedermayer2010-01-07
| | | | Originally committed as revision 21041 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move the definitions of data_buf and data_size closer to where they are used.Michael Niedermayer2010-01-07
| | | | Originally committed as revision 21040 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use av_guess_format() in place of the deprecated guess_format().Stefano Sabatini2010-01-01
| | | | Originally committed as revision 20994 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not explicitely set thread_count in the codec context.Michael Dorr2009-12-28
| | | | | | | | This is already done by avcodec_thread_init(). Patch by Michael Dorr <dorr <at> inb.uni-luebeck.de>. Originally committed as revision 20955 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not copy codec_tag in stream copy case if it is associated with a ↵Michael Niedermayer2009-12-25
| | | | | | | | different codec_id fixes issue1568 Originally committed as revision 20921 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use positive logic, improve readability, consistent with r20877.Stefano Sabatini2009-12-25
| | | | Originally committed as revision 20920 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Print usage instead of help when no files are specified.Ramiro Polla2009-12-21
| | | | Originally committed as revision 20905 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split show_usage() out of show_help().Ramiro Polla2009-12-21
| | | | Originally committed as revision 20904 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a general [options] to the basic usage string.Ramiro Polla2009-12-21
| | | | Originally committed as revision 20903 to svn://svn.ffmpeg.org/ffmpeg/trunk
* First print the program description and then the basic usage line.Ramiro Polla2009-12-21
| | | | Originally committed as revision 20902 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add -vlang option to set ISO 639 video stream language code.Matthieu Crapet2009-12-16
| | | | | | | | This is similar to existing -alang & -slang options. Patch by Matthieu Crapet m${surname} ^ gmail com. Originally committed as revision 20880 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use positive logic in opt_target() for selecting the PAL/othersStefano Sabatini2009-12-15
| | | | | | options, make its semantics mildly easier to compile by human minds. Originally committed as revision 20877 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify freeing of audio_language and subtitle_language.Matthieu Crapet2009-12-15
| | | | | | Patch by Matthieu, mcrapet gmail com Originally committed as revision 20875 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use symbolic names for PAL/NTSC/FILM rather than numeric constants in ↵Stefano Sabatini2009-12-14
| | | | | | | | opt_target(). Improve readability. Originally committed as revision 20870 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Correct typoVitor Sessak2009-12-14
| | | | Originally committed as revision 20868 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Include dup/drop info if any frames where duplicated or dropedMichael Niedermayer2009-12-14
| | | | | | | instead of when verbose>1. From ffmbc0.3 Originally committed as revision 20865 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Off by 1 bugfix for nb_frames_dup.Michael Niedermayer2009-12-14
| | | | | | From ffmbc0.3 Originally committed as revision 20864 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factorize ic->streams[i] out,Michael Niedermayer2009-12-14
| | | | | | change from ffmbc Originally committed as revision 20852 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Show help if no cmd line options are provided at all.Michael Niedermayer2009-12-13
| | | | | | This safes the users time to find out which of -h --help -? works. Originally committed as revision 20822 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move list_fmts() from ffmpeg.c to cmdutils.{h,c}, so that it can beStefano Sabatini2009-12-12
| | | | | | shared by the other ff* tools code. Originally committed as revision 20812 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do as the comment says and signal an error.Michael Niedermayer2009-12-08
| | | | Originally committed as revision 20770 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l bug, use av_fast_malloc() instead if av_malloc() for allocating audioMichael Niedermayer2009-12-08
| | | | | | | buffers. This and the previous revision fix a heap overflow. Originally committed as revision 20769 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Try to allocate audio buffer sizes depending on the number of input bytes.Michael Niedermayer2009-12-08
| | | | | | Fixes issue1167. Originally committed as revision 20768 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check that the buffer size speified to avcodec_encode_audio() is not larger ↵Michael Niedermayer2009-12-08
| | | | | | than the actual size. Originally committed as revision 20767 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not assume that av_get_bits_per_sample() is a multiple of 8.Michael Niedermayer2009-12-08
| | | | Originally committed as revision 20766 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Get rid of audio_out2, it seems unneeded.Michael Niedermayer2009-12-07
| | | | Originally committed as revision 20760 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Update frame_width and frame_height based on the lowres value.Jai Menon2009-12-05
| | | | | | Fixes issues 1387, 1097 and probably some other lowres related problems. Originally committed as revision 20741 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add 'const' attribute to the last_asked_format variable, fix aStefano Sabatini2009-12-05
| | | | | | compiler warning. Originally committed as revision 20740 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not crash on frame size changes.Michael Niedermayer2009-12-04
| | | | | | Fixes issue1481. Originally committed as revision 20730 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Update help text for -fpre option to make it a little less confusing.Ramiro Polla2009-12-03
| | | | Originally committed as revision 20713 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factorize common commandline options definition.Stefano Sabatini2009-11-29
| | | | Originally committed as revision 20664 to svn://svn.ffmpeg.org/ffmpeg/trunk