summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
* 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
* ffmpeg.c: allow using negative file indices to disable metadata copyingAnton Khirnov2010-11-08
| | | | Originally committed as revision 25706 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove graphparser.h header, move AVFilterInOut andStefano Sabatini2010-11-07
| | | | | | | | avfilter_graph_parse() declaration to libavfilter/avfiltergraph.h. Simplify, and less confusing for the user. Originally committed as revision 25705 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename AVFilterInOut field filter to filter_ctx, more semantically correct.Stefano Sabatini2010-11-07
| | | | Originally committed as revision 25700 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement get_preset_file() in cmdutils.h and use it to factorize codeStefano Sabatini2010-11-04
| | | | | | from ffmpeg.c and ffserver.c. Originally committed as revision 25679 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename avfilter_graph_destroy() to avfilter_graph_free().Stefano Sabatini2010-11-04
| | | | | | | | The new name is shorter and more consistent with the rest of the API. This change breaks libavfilter API/ABI. Originally committed as revision 25674 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement avfilter_graph_alloc().Stefano Sabatini2010-11-04
| | | | Originally committed as revision 25673 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove usage of deprecated libavcodec/audioconvert.h functions.Stefano Sabatini2010-11-03
| | | | Originally committed as revision 25668 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix timestamp computation when the timebase changes during filtering.Stefano Sabatini2010-11-02
| | | | | | | | The timestamps for all the buffered frames are scaled against AV_TIME_BASE_Q, and need to be scaled back to AV_TIME_BASE_Q when they are extracted from the filterchain. Originally committed as revision 25646 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffmpeg.c: reindentAnton Khirnov2010-11-02
| | | | Originally committed as revision 25637 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffmpeg.c: don't autocopy stream/chapter metadata if manual mapping is specifiedAnton Khirnov2010-11-02
| | | | Originally committed as revision 25636 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffmpeg.c: extend map_meta_data to allow advanced mappingsAnton Khirnov2010-11-02
| | | | | | i.e. to/from streams/chapters/programs. Originally committed as revision 25635 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove ffmpeg PGMYUV compatibility hack, which was deprecated sinceStefano Sabatini2010-11-02
| | | | | | | | | ages. The user is requested to specify "-f image2" in place of "-f pgmyuv" for reading/writing PGMYUV files, as for the other image formats. Originally committed as revision 25629 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use AV_RL32() in opt_codec_tag().Stefano Sabatini2010-10-31
| | | | Originally committed as revision 25618 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffmpeg: fix opt_codec_tag() return valueRamiro Polla2010-10-31
| | | | | | opt_codec_tag() is now used under OPT_FUNC2, which must return a value. Originally committed as revision 25616 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix ffserver-related regression (and crash) introduced in r25500.Rocky Cardwell2010-10-29
| | | | | | | | Fixes issue 2317. Patch by Rocky Cardwell, rocky d cardwell a lifespringschool d org Originally committed as revision 25603 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move new_output_stream() up for upcoming fix for issue 2317.Carl Eugen Hoyos2010-10-29
| | | | Originally committed as revision 25602 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ffmpeg.c: dynamically allocate metadata mapsAnton Khirnov2010-10-28
| | | | Originally committed as revision 25599 to svn://svn.ffmpeg.org/ffmpeg/trunk