ffmpeg: rename configure_filters() to configure_video_filters()
Mostly useful for the audio-filters branch, to make more apparent thedistinction between configure_audio_filters() andconfigure_video_filters().
Signed-off-by: Stefano Sabatini <firstname.lastname@example.org>
Merge remote branch 'qatar/master'
lavf: get rid of ffm-specific stuff in avformat.h
lavf: rename avf_sdp_create to av_sdp_create.
The new name is more consistent with the rest of the API.
avio: avio_ prefix for url_set_interrupt_cb.
avio: AVIO_ prefixes for URL_ open flags.
Fix ticket20Signed-off-by: Michael Niedermayer <email@example.com>
Revert "ffmpeg: fix aspect ratio setting"
This reverts commit d1eb50bb29caad9745631759265f475177df99b9.Reason, it breaks fate
Fix crash in ffmpeg.c with PIX_FMT_NONESigned-off-by: Michael Niedermayer <firstname.lastname@example.org>
ffmpeg: fix aspect ratio setting
This is done by adding a setsar filter at the beginning of theconfigured filterchain.
This implementation is more robust, since does not modify thefilterchain description (which was creating potential syntax errors),but directly modifies the filterchain structure....
Add silence support for AV_SAMPLE_FMT_U8.
Signed-off-by: Anton Khirnov <email@example.com>
I think the documentation of sameq is causing confusion and misuse ofthis option.
Signed-off-by: Michael Niedermayer <firstname.lastname@example.org>
ffmpeg: make 'bits_per_raw_sample' option more useful
Currently bits_per_raw_sample is exposed as an AVCodecContext option.The option is not very useful, because ffmpeg 1) overwrites it witha value from the upstream codec, or 2) it resets the value whenever...
Support changing pixel formats on avfilter input.Fix issue2217Signed-off-by: Michael Niedermayer <email@example.com>
Fix stream mapping regression
Another aspect ratio fix try. This leaves the setdar addition at the end (preferred by people).
Increase ffmpeg video encoding buffer size to permit encoding of DPX images
The header generated by the DPX encoder is 1664 bytes.
Insert setdar at the begin of a filter chain instead the end.This fixes -vf setsar
Revert "Do no modify terminal parameters using termios.h"
This reverts commit cb48e245e6e770f146220fac0a8bd4dc1a5e006c.
Reason being we like pressing "q" to quit ffmpeg.
ffmpeg: warns the user when the selected pixel format is ignored
cmdutils: remove list_fmts(), simplify
The function was only used in opt_sample_fmt() for listing the sampleformats. Move list_fmts() functionality directly intoopt_sample_fmt().
Als fix the warning:ffmpeg.c: In function ‘opt_audio_sample_fmt’:ffmpeg.c:2877: warning: passing argument 1 of ‘list_fmts’ from incompatible pointer type...
Merge remote-tracking branch 'newdev/master'
Add audio_service_type field to AVCodecContext for encoding and reportingof the service type in the audio bitstream.
ffmpeg: include conditionally the sws_flags variable
The variable is not used when libavfilter is enabled.Fix the warning:ffmpeg.c: At top level:ffmpeg.c:242: warning: ‘sws_flags’ defined but not used
Make multiple Ctrl-C capable to kill stuck protocols.Signed-off-by: Michael Niedermayer <firstname.lastname@example.org>
Make sure kbhit() is in conio.h
Conio.h is a non-standard header and may not have kbhit()prototyped. This fixes compile on OS/2 where the EMX version (we'reusing a fork) of conio.h only has getch() and getche().
Signed-off-by: Mans Rullgard <email@example.com>
Merged-by: Michael Niedermayer <firstname.lastname@example.org>
Do no modify terminal parameters using termios.h
Remove usage of tcgetattr and tcsetattr to modify terminalparameters, 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...
ffmpeg: modify help text for the map option
Change "file:stream[:syncfile:syncstream]" to"file.stream[:syncfile.syncstream]", the latter syntax is moreconsistent with the stream identifier form printed byav_dump_format(), and more readable. Both syntaxes are currently...
Replace FFmpeg with Libav in licence headers
Fix compilation error when CONFIG_AVFILTER is not defined.
Merge branch 'master' of git://git.ffmpeg.org/ffmpeg
ffmpeg: remove unused variable in ffmpeg_exit()
Fix the warning:ffmpeg.c: In function ‘ffmpeg_exit’:ffmpeg.c:509: warning: unused variable ‘j’
Do not use AVFMT_FLAG_NONBLOCK for the output file.
Allows to use output device alsa.
avio: avio_ prefix for url_fsize
Signed-off-by: Ronald S. Bultje <email@example.com>(cherry picked from commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec)
Make sure the first q press doesnt f*ck up the protocols and thus written files.Signed-off-by: Michael Niedermayer <firstname.lastname@example.org>
Fix seting of decode_interrupt_cb()Signed-off-by: Michael Niedermayer <email@example.com>
Signed-off-by: Ronald S. Bultje <firstname.lastname@example.org>
avio: add avio_tell macro as a replacement for url_ftell
Signed-off-by: Ronald S. Bultje <email@example.com>(cherry picked from commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b)
ffmpeg: Use av_pkt_dump_log2
This makes dumped packet timestamps proper for streams withtimebases other than AV_TIME_BASE.
Signed-off-by: Luca Barbato <firstname.lastname@example.org>(cherry picked from commit 5e33e7bdac70a4b70e31f4ae6f0344060346d0b8)
Signed-off-by: Luca Barbato <email@example.com>
avio: rename url_fopen/fclose -> avio_open/close.
Signed-off-by: Ronald S. Bultje <firstname.lastname@example.org>(cherry picked from commit 22a3212e32b696028e21f00871f3cb48c044029d)
Fix issue2619.regression introduced in 1762d9ced70ccc46c5d3e5d64e56a48d0fbbd4f7
lavf: add av_ prefix to dump_format()
Signed-off-by: Mans Rullgard <email@example.com>(cherry picked from commit 610219a598095f938705f200dfe3946455ef871a)
Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
It is pretty hopeless that other considerable projects will adoptlibavutil alone in other projects. Projects that need small footprintare better off with more specialized libraries such as gnulib or ratherjust copy the necessary parts that they need. With this in mind, nobody...
Restructure video filter implemenattion in ffmpeg.c.This fixes several bugs like multiple outputs and -aspect mixed with -vf
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...
Implement guessed_pts in avcodec_decode_video2
Signed-off-by: Nicolas George <firstname.lastname@example.org>Signed-off-by: Michael Niedermayer <email@example.com>
cmdutils: fix opt_values leak
Add free to uninit_opts and relocate opt_names to same
Signed-off-by: Ronald S. Bultje <firstname.lastname@example.org>(cherry picked from commit 3a6a9cdf5b8e4c4514e483484ef1f57b07ee16f2)
Adopt pkt_dts/pkt_pts in lavc clients
No behavior change; this makes DTS reliable with the next patch.
Signed-off-by: Ronald S. Bultje <email@example.com>(cherry picked from commit 6b474953975fd8ea64d1ed4d09c42b2d8e787c6f)
Use avformat_free_context for cleaning up muxers
Signed-off-by: Ronald S. Bultje <firstname.lastname@example.org>(cherry picked from commit b22dbb291d41e9fb038884bcebad2394c501cbaf)
Make avfilter_graph_free() free the graph.
Make avfilter_graph_free() free not only the internal structures, butalso the allocated graph, and set the graph pointer to NULL forincreased safety.
Signed-off-by: Mans Rullgard <email@example.com>...
ffmpeg.c: rename map_meta_data option to map_metadata
It's consistent with the -metadata option and easier to write.
Signed-off-by: Janne Grunau <firstname.lastname@example.org>(cherry picked from commit 87e4d9b252bc6fa3b982f7050013069c9dc3e05b)
Signed-off-by: Janne Grunau <email@example.com>
Add sample_aspect_ratio fields to vsrc_buffer arguments.This fixes aspect handling in ffmpegThis is based on a patch by baptiste
Make ffmpeg warns the user when the selected sample format is ignored.
Signed-off-by: Mans Rullgard <firstname.lastname@example.org>(cherry picked from commit fa34a3626cf1aa19acbe9f8c6fcddb6c3eb8eaa1)
Make local variables static.
Signed-off-by: Mans Rullgard <email@example.com>(cherry picked from commit a6d1bd05c906fc7ad34fae1029a45ec3cbcc4fcc)
Do not set audio_resample to 0 if audio_sync_method is > 1.
If audio_sync_method is >1 the resampler is used for audio driftcompensation, and do_audio_out() was causing an assert failure becauseaudio_resample was not set.
Fix issue 2516, which was introduced by SVN r25939....
streamid does not work with newaudio, newvideo, newsubtitle
The problem is that the ffmpeg (the app) -streamid option did not workwith -newaudio/-newvideo/-newsubtitle.
The cause was a conflict between the feature where streamid values were...
Update threshold to detect real timebase for stream copy.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 layerlike it has been done prior libavfilter.
New "copytb" ffmpeg cli option to copy input stream time base when stream 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 formatname.
Originally committed as revision 26335 to svn://svn.ffmpeg.org/ffmpeg/trunk
Reindent after 26330.
Originally committed as revision 26331 to svn://svn.ffmpeg.org/ffmpeg/trunk
Introduce av_metadata_copy() to copy metadata from one struct to another.
Originally committed as revision 26330 to svn://svn.ffmpeg.org/ffmpeg/trunk
Do not allocate unused swscale context when libavfilter is compiled in
Originally committed as revision 26317 to svn://svn.ffmpeg.org/ffmpeg/trunk
Fix warnings:ffmpeg.c: In function ‘new_video_stream’:ffmpeg.c:3701:18: warning: ‘codec_id’ may be used uninitialized in this functionffmpeg.c: In function ‘new_audio_stream’:ffmpeg.c:3848:18: warning: ‘codec_id’ may be used uninitialized in this function...
Change 'arg' type in parse_meta_type, fix warning: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..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.Better ideas are welcome ...
Originally committed as revision 26219 to svn://svn.ffmpeg.org/ffmpeg/trunk
Use AVOption for muxers in ffmpeg.
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)
Originally committed as revision 26175 to svn://svn.ffmpeg.org/ffmpeg/trunk
Allow output formats without any streams.
Required for future metadata format.
Originally committed as revision 26100 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 25940 to svn://svn.ffmpeg.org/ffmpeg/trunk
Fix encoding when the input audio format/rate/channels changes duringtranscoding.
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.
Originally committed as revision 25927 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 25885 to svn://svn.ffmpeg.org/ffmpeg/trunk
add subtitle codec autodetection
Originally committed as revision 25884 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 25862 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c: copy global metadata by default
Originally committed as revision 25794 to svn://svn.ffmpeg.org/ffmpeg/trunk
Use the new libavcore audio channel API.
This also allows to remove a linking dependency of libavfilter onlibavcodec.
Originally committed as revision 25789 to svn://svn.ffmpeg.org/ffmpeg/trunk
Cosmetics, fix indentation
Originally committed as revision 25773 to svn://svn.ffmpeg.org/ffmpeg/trunk
allow passing subtitles header between decoder and encoder
Originally committed as revision 25745 to svn://svn.ffmpeg.org/ffmpeg/trunk
add global header support for subtitles encoding
Originally committed as revision 25742 to svn://svn.ffmpeg.org/ffmpeg/trunk