History | View | Annotate | Download (160 KB)
Fix issue2619.regression introduced in 1762d9ced70ccc46c5d3e5d64e56a48d0fbbd4f7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavf: add av_ prefix to dump_format()
Signed-off-by: Mans Rullgard <mans@mansr.com>(cherry picked from commit 610219a598095f938705f200dfe3946455ef871a)
Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
Restructure video filter implemenattion in ffmpeg.c.This fixes several bugs like multiple outputs and -aspect mixed with -vf
Deprecate avcodec_thread_init()
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 <nicolas.george@normalesup.org>Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils: fix opt_values leak
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 clients
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 muxers
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>(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.
Simplify usage.
Signed-off-by: Mans Rullgard <mans@mansr.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 <janne-ffmpeg@jannau.net>(cherry picked from commit 87e4d9b252bc6fa3b982f7050013069c9dc3e05b)
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 <mans@mansr.com>(cherry picked from commit fa34a3626cf1aa19acbe9f8c6fcddb6c3eb8eaa1)
Make local variables static.
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.
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
fixes issue2465.
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
Reindent.
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
cosmetic: indentation
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
Add avfilter_graph_create_filter().
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
Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enumSampleFormat with AVSampleFormat.
Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c: add a forgotten break in chapter copying
only copy chapters from one file
Originally committed as revision 25729 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c: reindent
Originally committed as revision 25728 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c: add an option for copying chapters
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 copying
Originally committed as revision 25706 to svn://svn.ffmpeg.org/ffmpeg/trunk
Remove graphparser.h header, move AVFilterInOut andavfilter_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.
Originally committed as revision 25700 to svn://svn.ffmpeg.org/ffmpeg/trunk
Implement get_preset_file() in cmdutils.h and use it to factorize codefrom 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().
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().
Originally committed as revision 25673 to svn://svn.ffmpeg.org/ffmpeg/trunk
Remove usage of deprecated libavcodec/audioconvert.h functions.
Originally committed as revision 25668 to svn://svn.ffmpeg.org/ffmpeg/trunk
Fix timestamp computation when the timebase changes during filtering.
The timestamps for all the buffered frames are scaled againstAV_TIME_BASE_Q, and need to be scaled back to AV_TIME_BASE_Q when theyare extracted from the filterchain.
Originally committed as revision 25646 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 25637 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c: don't autocopy stream/chapter metadata if manual mapping is specified
Originally committed as revision 25636 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c: extend map_meta_data to allow advanced mappings
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 sinceages.
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().
Originally committed as revision 25618 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg: fix opt_codec_tag() return value
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.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.
Originally committed as revision 25602 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c: dynamically allocate metadata maps
Originally committed as revision 25599 to svn://svn.ffmpeg.org/ffmpeg/trunk
Factorize: opt_{audio,video,subtitle}_tag() -> opt_codec_tag().
Originally committed as revision 25596 to svn://svn.ffmpeg.org/ffmpeg/trunk
Remove unused variables picture_crop_temp and picture_pad_temp.
Originally committed as revision 25530 to svn://svn.ffmpeg.org/ffmpeg/trunk
Add a -force_key_frames option to ffmpeg.
The option is useful to ensure that there is a seek point exactly at aplace the user will probably want to jump precisely sometime, themajor example would be the end of an opening and the beginning of achapter. The scene change detection system will often make it happen,...
Implement a common get_filtered_video_frame(), shared between ffplay.cand ffmpeg.c.
Originally committed as revision 25520 to svn://svn.ffmpeg.org/ffmpeg/trunk
Make help message for the -crop* options consistent with that of the-pad* options and more direct.
Originally committed as revision 25519 to svn://svn.ffmpeg.org/ffmpeg/trunk
Remove -crop* options.
Users are required to use the libavfilter crop filter.
Originally committed as revision 25518 to svn://svn.ffmpeg.org/ffmpeg/trunk
Cosmetics: use a more compact notation, improve readability and reduceline count.
Originally committed as revision 25510 to svn://svn.ffmpeg.org/ffmpeg/trunk
Reset metadata after opt_output_file(), fix the previous commit.
Spotted by elenril on irc.
Originally committed as revision 25509 to svn://svn.ffmpeg.org/ffmpeg/trunk
Use an AVMetadata struct for storing metadata, simplify.
Originally committed as revision 25508 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c/ffprobe.c: remove all uses of av_metadata_conv()patch by Anton Khirnov anton at khirnov dot net
Originally committed as revision 25503 to svn://svn.ffmpeg.org/ffmpeg/trunk
Add avfilter_graph_config().
Originally committed as revision 25502 to svn://svn.ffmpeg.org/ffmpeg/trunk
Place the bitstream_filters variable in the AVOutputStream, thusgreatly simplifying its handling and reducing code duplication.
Patch by Nicolas George -bsf nicolas*george|normalesup+org.
Originally committed as revision 25501 to svn://svn.ffmpeg.org/ffmpeg/trunk
Move the allocation of the AVOutputStream structure earlier in thecode flow, in the new_video_stream() / new_audio_stream() /new_subtitle_stream() functions.
Patch by Nicolas George <$name.$surname@normalesup.org>.
Originally committed as revision 25500 to svn://svn.ffmpeg.org/ffmpeg/trunk
Factorize definition of the output_filter defined in both ffplay.c andffmpeg.c.Replace it with a more generic definition which can be shared.
Originally committed as revision 25453 to svn://svn.ffmpeg.org/ffmpeg/trunk
Extend buffer source to accept the time base for the output PTS.
Originally committed as revision 25451 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg: Use guess_correct_pts() to set decoded picture timestamps
Originally committed as revision 25431 to svn://svn.ffmpeg.org/ffmpeg/trunk
move av_find_stream_info() info struct to AVStream to avoid messy (re)allocation
Originally committed as revision 25418 to svn://svn.ffmpeg.org/ffmpeg/trunk
fix bitstream filter option mapping when using -newvideo and friendsThere was an off-by-one when addressing bitstream_filters[] in this situation.
Originally committed as revision 25398 to svn://svn.ffmpeg.org/ffmpeg/trunk
Pass RC parameters on stream copy to the muxer.
Originally committed as revision 25384 to svn://svn.ffmpeg.org/ffmpeg/trunk
cosmetic: break long line
Originally committed as revision 25377 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg: Fix prototype of some OPT_FUNC2 functions. They must return an int.
Originally committed as revision 25358 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 25329 to svn://svn.ffmpeg.org/ffmpeg/trunk
Add init and uninit functions to cmdutils, reduces code duplicationbetween ffmpeg and ffplay and avoids a valgrind error by freeingavformat_opts->key.
Originally committed as revision 25309 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg: replace MAX_STREAMS by an arbitrary sanity check
Originally committed as revision 25304 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg: dynamically allocate bitstream_filters
Originally committed as revision 25303 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg: dynamically allocate stream_maps
Originally committed as revision 25302 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg: dynamically allocate output_codecs
Originally committed as revision 25301 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg: dynamically allocate input_codecs
Originally committed as revision 25300 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg: dynamically allocate input_files_ts_scale
Originally committed as revision 25299 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg: dynamically allocate streamid_map
Originally committed as revision 25298 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg: add a grow_array() helper function
Originally committed as revision 25297 to svn://svn.ffmpeg.org/ffmpeg/trunk
Rename libavutil/assert.h to avassert.h
This avoids conflicts with the system assert.h.
Originally committed as revision 25284 to svn://svn.ffmpeg.org/ffmpeg/trunk
av_assert() system.With this the developer can now choose if he wants an assert always enabled or at whichcompile time assert level. This can thus replace the #define NDEBUG hacks
Originally committed as revision 25278 to svn://svn.ffmpeg.org/ffmpeg/trunk
User application side of Codec specific parameters.
Originally committed as revision 25266 to svn://svn.ffmpeg.org/ffmpeg/trunk
use strict_std_complience from avcodec_opts[AVMEDIA_TYPE_*]
Options are not yet set for video encoders and for codec specificdefaults it is desireable to set the codec options only after the codecis known.
Originally committed as revision 25230 to svn://svn.ffmpeg.org/ffmpeg/trunk
Change the syntax of the crop filter from x:y:w:h to w:h:x:y.
Slightly more intuitive and required by a pending changes for makingthe filter parametric.
Originally committed as revision 25184 to svn://svn.ffmpeg.org/ffmpeg/trunk
Doxy consistency cosmetics
Originally committed as revision 25176 to svn://svn.ffmpeg.org/ffmpeg/trunk
Enable AV_LOG_SKIP_REPEATED to maintain previous behavior.
Originally committed as revision 25175 to svn://svn.ffmpeg.org/ffmpeg/trunk