summaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation error when CONFIG_AVFILTER is not defined.Thierry Foucu2011-03-171-2/+7
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge branch 'master' of git://git.ffmpeg.org/ffmpegMichael Niedermayer2011-03-121-1/+0
|\ | | | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: remove unused variable in ffmpeg_exit()Stefano Sabatini2011-03-121-1/+0
| | | | | | | | | | | | | | | | 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-071-2/+2
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-041-2/+2
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * ffmpeg: Use av_pkt_dump_log2Martin Storsjö2011-03-021-1/+2
| | | | | | | | | | | | | | 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-231-2/+2
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lavf: add av_ prefix to dump_format()Anton Khirnov2011-02-161-5/+5
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Merge libavcore into libavutilReinhard Tartler2011-02-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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-091-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-1/+0
| | | | | | | | | | | | 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-051-2/+3
| | | | | | | | | | | | 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-041-15/+1
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Make avfilter_graph_free() free the graph.Stefano Sabatini2011-02-041-4/+1
| | | | | | | | | | | | | | | | | | | | 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-021-2/+12
| | | | | | | | | | | | 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-311-1/+7
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Make local variables static.Diego Elio Pettenò2011-01-251-2/+2
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Do not set audio_resample to 0 if audio_sync_method is > 1.Stefano Sabatini2011-01-241-1/+3
| | | | | | | | | | | | | | | | | | | | 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-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Do not use AVFMT_FLAG_NONBLOCK for the output file.Carl Eugen Hoyos2011-03-081-1/+0
| | | | | | | | Allows to use output device alsa.
* | avio: avio_ prefix for url_fsizeAnton Khirnov2011-03-081-2/+2
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec)
* | Make sure the first q press doesnt f*ck up the protocols and thus written files.Michael Niedermayer2011-03-071-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix seting of decode_interrupt_cb()Michael Niedermayer2011-03-071-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-051-2/+2
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b)
* | ffmpeg: Use av_pkt_dump_log2Martin Storsjö2011-03-031-1/+2
| | | | | | | | | | | | | | | | This makes dumped packet timestamps proper for streams with timebases other than AV_TIME_BASE. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 5e33e7bdac70a4b70e31f4ae6f0344060346d0b8)
* | avio: rename url_fopen/fclose -> avio_open/close.Anton Khirnov2011-02-231-2/+2
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 22a3212e32b696028e21f00871f3cb48c044029d)
* | Fix issue2619.Michael Niedermayer2011-02-191-1/+2
| | | | | | | | | | | | regression introduced in 1762d9ced70ccc46c5d3e5d64e56a48d0fbbd4f7 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add av_ prefix to dump_format()Anton Khirnov2011-02-181-5/+5
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 610219a598095f938705f200dfe3946455ef871a)
* | Merge libavcore into libavutilReinhard Tartler2011-02-161-3/+3
| | | | | | | | Done to keep ABI compatible. Otherwise this is just silly
* | Restructure video filter implemenattion in ffmpeg.c.Michael Niedermayer2011-02-141-57/+71
| | | | | | | | | | | | 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-111-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-3/+1
| | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: fix opt_values leakJames Zern2011-02-061-1/+0
| | | | | | | | | | | | | | 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-061-2/+3
| | | | | | | | | | | | | | 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-061-15/+1
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit b22dbb291d41e9fb038884bcebad2394c501cbaf)
* | Make avfilter_graph_free() free the graph.Stefano Sabatini2011-02-061-4/+1
| | | | | | | | | | | | | | | | | | | | | | 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-041-2/+12
| | | | | | | | | | | | | | 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-311-2/+16
| | | | | | | | | | 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-311-1/+7
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit fa34a3626cf1aa19acbe9f8c6fcddb6c3eb8eaa1)
* | Make local variables static.Diego Elio Pettenò2011-01-261-2/+2
| | | | | | | | | | 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-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | 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-231-1/+0
|/ | | | | | | | | | | | | | | | | | | 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-181-1/+1
| | | | 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-171-1/+4
| | | | like it has been done prior libavfilter.
* New "copytb" ffmpeg cli option to copy input stream time base when stream ↵Baptiste Coudurier2011-01-141-1/+3
| | | | | | | | 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-141-2/+6
| | | | | | name. Originally committed as revision 26335 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reindent after 26330.Ronald S. Bultje2011-01-141-1/+1
| | | | 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-141-17/+7
| | | | 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-121-1/+1
| | | | Originally committed as revision 26317 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix warnings:Baptiste Coudurier2011-01-111-3/+3
| | | | | | | | | | | 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
OpenPOWER on IntegriCloud