summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
...
* Make sure kbhit() is in conio.hDave Yeo2011-03-22
| | | | | | | | Conio.h is a non-standard header and may not have kbhit() prototyped. This fixes compile on OS/2 where the EMX version (we're using a fork) of conio.h only has getch() and getche(). Signed-off-by: Mans Rullgard <mans@mansr.com>
* Do no modify terminal parameters using termios.hPanagiotis H.M. Issaris2011-03-20
| | | | | | | | | | | | | | Remove usage of tcgetattr and tcsetattr to modify terminal parameters, and rely on ctrl-c to stop instead of pressing 'q'. On systems with conio.h, keep the old behavior. Changing the terminal settings causes problems if multiple instances are running asynchronously on the same terminal, such as during a parallel FATE run, or if the process crashes before restoring the terminal. In both cases, the terminal state is messed up requiring a manual reset. Signed-off-by: Mans Rullgard <mans@mansr.com>
* ffmpeg: modify help text for the map optionStefano Sabatini2011-03-20
| | | | | | | | | | Change "file:stream[:syncfile:syncstream]" to "file.stream[:syncfile.syncstream]", the latter syntax is more consistent with the stream identifier form printed by av_dump_format(), and more readable. Both syntaxes are currently accepted by the opt_map() code. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* ffmpeg: remove unused variable in ffmpeg_exit()Stefano Sabatini2011-03-12
| | | | | | | | Fix the warning: ffmpeg.c: In function ‘ffmpeg_exit’: ffmpeg.c:509: warning: unused variable ‘j’ Signed-off-by: Mans Rullgard <mans@mansr.com>
* avio: avio_ prefix for url_fsizeAnton Khirnov2011-03-07
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-04
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* ffmpeg: Use av_pkt_dump_log2Martin Storsjö2011-03-02
| | | | | | | This makes dumped packet timestamps proper for streams with timebases other than AV_TIME_BASE. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* avio: rename url_fopen/fclose -> avio_open/close.Anton Khirnov2011-02-23
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* lavf: add av_ prefix to dump_format()Anton Khirnov2011-02-16
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Merge libavcore into libavutilReinhard Tartler2011-02-15
| | | | | | | | | | | | It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* Deprecate avcodec_thread_init()Alexander Strange2011-02-09
| | | | | | | | | | | | | | As a side effect of the last commit, avcodec_open() now calls it automatically, so there is no longer any need for clients to call it. Instead they should set AVCodecContext.thread_count. avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the next MAJOR libavcodec bump. Rename the functions to ff_thread_init/free, since they are now internal. Wrappers are provided to maintain API compatibility. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* cmdutils: fix opt_values leakJames Zern2011-02-05
| | | | | | Add free to uninit_opts and relocate opt_names to same Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* Adopt pkt_dts/pkt_pts in lavc clientsAlexander Strange2011-02-05
| | | | | | No behavior change; this makes DTS reliable with the next patch. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* Use avformat_free_context for cleaning up muxersMartin Storsjö2011-02-04
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* Make avfilter_graph_free() free the graph.Stefano Sabatini2011-02-04
| | | | | | | | | | Make avfilter_graph_free() free not only the internal structures, but also the allocated graph, and set the graph pointer to NULL for increased safety. Simplify usage. Signed-off-by: Mans Rullgard <mans@mansr.com>
* ffmpeg.c: rename map_meta_data option to map_metadataAnton Khirnov2011-02-02
| | | | | | It's consistent with the -metadata option and easier to write. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* Make ffmpeg warns the user when the selected sample format is ignored.Stefano Sabatini2011-01-31
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Make local variables static.Diego Elio Pettenò2011-01-25
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Do not set audio_resample to 0 if audio_sync_method is > 1.Stefano Sabatini2011-01-24
| | | | | | | | | | If audio_sync_method is >1 the resampler is used for audio drift compensation, and do_audio_out() was causing an assert failure because audio_resample was not set. Fix issue 2516, which was introduced by SVN r25939. Signed-off-by: Mans Rullgard <mans@mansr.com>
* streamid does not work with newaudio, newvideo, newsubtitleMike Scheutzow2011-01-22
| | | | | | | | | | | | | | | | | | fixes issue2465. The problem is that the ffmpeg (the app) -streamid option did not work with -newaudio/-newvideo/-newsubtitle. The cause was a conflict between the feature where streamid values were reset to default for each output filename, and the implementation of -new*, which requires that the -new* option be specified after the target filename. My patch changes the ffmpeg behavior so that user-specified streamid values apply to all the following output files on the command line (rather than just the next output filename.) Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* Update threshold to detect real timebase for stream copy.Michael Niedermayer2011-01-18
| | | | This may fix a bug where quicktime files use 1/600 timebase.
* Feed the filter chain with the sample aspect ratio from the muxer or codec layerMichael Niedermayer2011-01-17
| | | | like it has been done prior libavfilter.
* New "copytb" ffmpeg cli option to copy input stream time base when stream ↵Baptiste Coudurier2011-01-14
| | | | | | | | copying. This should avoid non monotone timestamps for video streams with vfr. Originally committed as revision 26340 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make opt_audio_sample_fmt() abort in case of invalid sample formatStefano Sabatini2011-01-14
| | | | | | name. Originally committed as revision 26335 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reindent after 26330.Ronald S. Bultje2011-01-14
| | | | Originally committed as revision 26331 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Introduce av_metadata_copy() to copy metadata from one struct to another.Ronald S. Bultje2011-01-14
| | | | Originally committed as revision 26330 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not allocate unused swscale context when libavfilter is compiled inBaptiste Coudurier2011-01-12
| | | | Originally committed as revision 26317 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix warnings:Baptiste Coudurier2011-01-11
| | | | | | | | | | | ffmpeg.c: In function ‘new_video_stream’: ffmpeg.c:3701:18: warning: ‘codec_id’ may be used uninitialized in this function ffmpeg.c: In function ‘new_audio_stream’: ffmpeg.c:3848:18: warning: ‘codec_id’ may be used uninitialized in this function ffmpeg.c: In function ‘new_subtitle_stream’: ffmpeg.c:3926:18: warning: ‘codec_id’ may be used uninitialized in this function Originally committed as revision 26313 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change 'arg' type in parse_meta_type, fix warning:Baptiste Coudurier2011-01-11
| | | | | | | ffmpeg.c: In function ‘parse_meta_type’: ffmpeg.c:3323:13: warning: assignment discards qualifiers from pointer target type Originally committed as revision 26312 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix lowres > 0 with --enable-avfilter..Anatoly Nenashev2011-01-07
| | | | | | | | Fixes issue 2072 and issue 2421. Patch by Anatoly Nenashev, anatoly d nenashev a ovsoft d ru Originally committed as revision 26252 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix/cleanup m/ljpeg encoding pix fmt selection code in ffmpeg.c.Michael Niedermayer2011-01-05
| | | | | | Better ideas are welcome ... Originally committed as revision 26219 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use AVOption for muxers in ffmpeg.Anssi Hannula2011-01-02
| | | | | | Patch by Anssi Hannula, anssi d hannula d iki d fi Originally committed as revision 26199 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use avsubtitle_free() instead of re-implementing it partially (fix a memleak)Aurelien Jacobs2010-12-31
| | | | Originally committed as revision 26175 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Allow output formats without any streams.Anton Khirnov2010-12-27
| | | | | | Required for future metadata format. Originally committed as revision 26100 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reindent.Stefano Sabatini2010-12-12
| | | | Originally committed as revision 25940 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix encoding when the input audio format/rate/channels changes duringStefano Sabatini2010-12-12
| | | | | | | | | | transcoding. Fix issue #2292. Patch sponsored by KIM Keep In Mind GmbH, srl. Originally committed as revision 25939 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Show per-codec options on FFmpeg commandline help.Justin Ruggles2010-12-10
| | | | Originally committed as revision 25927 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetic: indentationAurelien Jacobs2010-12-04
| | | | Originally committed as revision 25885 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add subtitle codec autodetectionAurelien Jacobs2010-12-04
| | | | Originally committed as revision 25884 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add avfilter_graph_create_filter().Stefano Sabatini2010-12-02
| | | | Originally committed as revision 25862 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffmpeg.c: copy global metadata by defaultAnton Khirnov2010-11-22
| | | | Originally committed as revision 25794 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use the new libavcore audio channel API.Stefano Sabatini2010-11-21
| | | | | | | This also allows to remove a linking dependency of libavfilter on libavcodec. Originally committed as revision 25789 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics, fix indentationBaptiste Coudurier2010-11-20
| | | | Originally committed as revision 25773 to svn://svn.ffmpeg.org/ffmpeg/trunk
* allow passing subtitles header between decoder and encoderAurelien Jacobs2010-11-13
| | | | Originally committed as revision 25745 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add global header support for subtitles encodingAurelien Jacobs2010-11-13
| | | | Originally committed as revision 25742 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enumStefano Sabatini2010-11-12
| | | | | | SampleFormat with AVSampleFormat. Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffmpeg.c: add a forgotten break in chapter copyingAnton Khirnov2010-11-12
| | | | | | only copy chapters from one file Originally committed as revision 25729 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffmpeg.c: reindentAnton Khirnov2010-11-12
| | | | Originally committed as revision 25728 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffmpeg.c: add an option for copying chaptersAnton Khirnov2010-11-12
| | | | | | fixes issue 2068 Originally committed as revision 25727 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 17:04:17 +0000