summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
* Fix issue2619.Michael Niedermayer2011-02-19
| | | | | | regression introduced in 1762d9ced70ccc46c5d3e5d64e56a48d0fbbd4f7 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: add av_ prefix to dump_format()Anton Khirnov2011-02-18
| | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 610219a598095f938705f200dfe3946455ef871a)
* Merge libavcore into libavutilReinhard Tartler2011-02-16
| | | | Done to keep ABI compatible. Otherwise this is just silly
* Restructure video filter implemenattion in ffmpeg.c.Michael Niedermayer2011-02-14
| | | | | | This fixes several bugs like multiple outputs and -aspect mixed with -vf Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Deprecate avcodec_thread_init()Alexander Strange2011-02-11
| | | | | | | | | | | | | | | 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> (cherry picked from commit c0b102ca03fe92250f1ce620aec3836f529fc1d6)
* Implement guessed_pts in avcodec_decode_video2Nicolas George2011-02-07
| | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* cmdutils: fix opt_values leakJames Zern2011-02-06
| | | | | | | Add free to uninit_opts and relocate opt_names to same Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 3a6a9cdf5b8e4c4514e483484ef1f57b07ee16f2)
* Adopt pkt_dts/pkt_pts in lavc clientsAlexander Strange2011-02-06
| | | | | | | No behavior change; this makes DTS reliable with the next patch. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 6b474953975fd8ea64d1ed4d09c42b2d8e787c6f)
* Use avformat_free_context for cleaning up muxersMartin Storsjö2011-02-06
| | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit b22dbb291d41e9fb038884bcebad2394c501cbaf)
* Make avfilter_graph_free() free the graph.Stefano Sabatini2011-02-06
| | | | | | | | | | | 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> (cherry picked from commit 4359288c565705d1734f63d277f8918ee5af5e54)
* ffmpeg.c: rename map_meta_data option to map_metadataAnton Khirnov2011-02-04
| | | | | | | It's consistent with the -metadata option and easier to write. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit 87e4d9b252bc6fa3b982f7050013069c9dc3e05b)
* Add sample_aspect_ratio fields to vsrc_buffer arguments.Michael Niedermayer2011-01-31
| | | | | This fixes aspect handling in ffmpeg This is based on a patch by baptiste
* Make ffmpeg warns the user when the selected sample format is ignored.Stefano Sabatini2011-01-31
| | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit fa34a3626cf1aa19acbe9f8c6fcddb6c3eb8eaa1)
* Make local variables static.Diego Elio Pettenò2011-01-26
| | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit a6d1bd05c906fc7ad34fae1029a45ec3cbcc4fcc)
* Do not set audio_resample to 0 if audio_sync_method is > 1.Stefano Sabatini2011-01-26
| | | | | | | | | | | 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> (cherry picked from commit 07b48f8c7adaaf4020514816ec9b8d14cc8c5fbd)
* streamid does not work with newaudio, newvideo, newsubtitleMike Scheutzow2011-01-23
| | | | | | | | | | | | | | | | | | | 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> (cherry picked from commit 20ac9de3df9b129a4a312d626fed0e2bbb760200)
* 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