Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/ffmpeg.c
AgeCommit message (Collapse)Author
2012-12-20Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'Michael Niedermayer
* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06': avconv: use new options parser. Conflicts: ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19ffmpeg: Fix shortest with libx264Michael Niedermayer
Encoders that buffer a significant number of frames where a "few" frames off with -shortest Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-16ffmpeg: replace magic number with VSYNC_CFRPeter Ross
2012-12-12ffmpeg: sub2video: use start and end time.Nicolas George
Until now, the end_display_time was ignored, making single packets subtitles (like dvdsub) stay indefinitely. start_display_time was also ignored, but is it almost always 0.
2012-12-04ffmpeg: small indent fix.Clément Bœsch
2012-12-04ffmpeg: use the correct variables in do_video_stats()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-04Update video stats log during encode flushThierry Foucu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-24ffmpeg: fix mixed declarations and statements.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-24ffmpeg: Correct starttime based on non discarded streams.Michael Niedermayer
Fixes Ticket1830 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-24ffmpeg: minor simplification of wraping codeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-22ffmpeg: add setting of field_order flagTim Nicholson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-22ffmpeg: fix weird reindentStefano Sabatini
2012-11-22ffmpeg: print debug_ts off and off_time values with timestamp helper routinesStefano Sabatini
2012-11-22ensure comment blocks that contain doxygen commands start with double asterixPeter Ross
Reveiwed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21ffmpeg: rework debugging timestamp logs in process_input()Stefano Sabatini
Print timestamps before and after ffmpeg timestamp postprocessing. Help to debug how ffmpeg processes the input timestamps.
2012-11-14ffmpeg: fix double ;;Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14ffmpeg: fix audio timestamps on stream copy with -ssMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88': doc: git-howto: Leave reviewers time to react before pushing patches Include libavutil/channel_layout.h instead of libavutil/audioconvert.h lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/git-howto.texi ffmpeg_filter.c libavcodec/flacdec.c libavcodec/imc.c libavcodec/mpegaudiodec.c libavcodec/utils.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffer.c libavutil/Makefile libavutil/audioconvert.h libavutil/channel_layout.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-08Fix the packet duration when flushing the encoder.Thierry Foucu
A similar patch was posted by Justin Ruggles <justin.ruggles@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'Michael Niedermayer
* commit '9221efef7968463f3e3d9ce79ea72eaca082e73f': lavf: fix av_interleaved_write_frame() doxy. lavf: clarify the lifetime of demuxed packets. avconv: do not free muxed packet on streamcopy. crc: move doxy to the header vf_drawtext: do not use deprecated av_tree_node_size x86: Refactor PSWAPD fallback implementations and port to cpuflags Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30Merge commit '381dc1a5ec0925b281c573457c413ae643567086'Michael Niedermayer
* commit '381dc1a5ec0925b281c573457c413ae643567086': fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups fate: Add shorthands for acodec PCM and ADPCM tests avconv: Drop unused function argument from do_video_stats() cmdutils: Conditionally compile libswscale-related bits aacenc: Drop some unused function arguments rtsp: Avoid a cast when calling strtol nut: support textual data nutenc: verbosely report unsupported negative pts Conflicts: cmdutils.c ffmpeg.c libavformat/nut.c libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27ffmpeg: use av_rescale_delta() for audio stream copyMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27ffmpeg: use av_rescale_delta() on the audio filter inputMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27ffmpeg: trivial simplificationMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'Michael Niedermayer
* commit '1b891d17c531e8a63c2974aab4bf997ce70746f3': avconv: fix bitrate report when writing to /dev/null avfilter: fix graphparser memleaks on error paths rawdec: remove ff_raw_read_header pcmdec: remove dependency from rawdec g722: refactor out of rawdec.c rawvideo: use a specific read_header Conflicts: ffmpeg.c libavformat/Makefile libavformat/rawdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-25ffmpeg: fix null ptr deref in psnr printing codeMichael Niedermayer
Fixes CID205005 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: asfdec: cosmetics, reformat ff_asf_parse_packet() g.723.1: add missing CODEC_CAP_DR1 avconv: remove now unneeded calls to avcodec_get_frame_defaults(). lavc: initialize output AVFrame before decoding. Conflicts: libavformat/asfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-24Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'Michael Niedermayer
* commit '80521c1997a23e148edf89e11b939ab8646297ca': build: allow targets to specify extra objects to link with executables swscale: avoid pointless use of compound literals libm: add fallbacks for various single-precision functions network: use getservbyport() only if available network: add fallbacks for INADDR_LOOPBACK and INET_ADDRSTRLEN Include sys/time.h before sys/resource.h Conflicts: Makefile configure libavutil/libm.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23ffmpeg: check avpicture_get_size() retuen valueMichael Niedermayer
Fixes CID205018 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-22ffmpeg/lavc: move experimental warnings to libavcodec.Michael Niedermayer
This way they are available to all applications and not just ffmpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-22Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4'Michael Niedermayer
* commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4': rtpdec: Don't pass a non-AVClass pointer as log context rtsp: Update a comment to the current filename scheme avcodec: handle AVERROR_EXPERIMENTAL avutil: Add AVERROR_EXPERIMENTAL avcodec: prefer decoders without CODEC_CAP_EXPERIMENTAL Conflicts: doc/APIchanges ffmpeg.c libavcodec/utils.c libavformat/rtpdec.c libavutil/error.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17ffmpeg: Make video filter graph reinit user selectableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-13Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'Michael Niedermayer
* commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be': Remove libmpeg2 #define remnants De-doxygenize some top-level files Conflicts: ffmpeg.c ffmpeg.h ffmpeg_filter.c ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-10Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'Michael Niedermayer
* commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2': avconv: remove -same_quant Conflicts: Changelog doc/faq.texi ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-02fix exit_program() prototypesMichael Niedermayer
This fixes 2 warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-02Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: ARM: fix Thumb PIC on Apple nut: add do {} while (0) to GET_V tiffenc: Check av_malloc() results. tiffenc: Simplify pixel format setup using AVPixFmtDescriptor. Use atexit() instead of defining a custom exit_program() interface. msvc: Fix detection of VFW & Avisynth required libs Conflicts: ffmpeg.c ffmpeg_opt.c ffplay.c ffprobe.c ffserver.c libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-02ffmpeg: print muxed packet sizes in debug output tooMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-30ffmpeg: disable buffering for stderr, needed for win32 runtimeThe makemkv authors
Found in http://www.makemkv.com/download/ffmpeg/mmffmpeg-1.7.7.patch.gz Commit message by commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-27ffmpeg: add option to control copying of frames prior to start.Michael Niedermayer
Normally we discard things prior to the intended start for stream copy this is not always possible, and its not done by default this option allows discarding to be enabled this is primarely usefull when transcoding a video and stream copying an audio stream. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-27ffmpeg: allow printing muxer side packet timestamp debuging infoMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-25Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'Michael Niedermayer
* commit '7751e4693dd10ec98c20fbd9887233b575034272': ogg: check that the expected number of headers had been parsed libx264: change default to closed gop to match x264cli Use avcodec_free_frame() to free AVFrames. lavf: use a malloced AVFrame in try_decode_frame(). lavc: add avcodec_free_frame(). lavc: ensure extended_data is set properly on decoding lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults() lavc: use av_mallocz to allocate AVFrames. lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults Conflicts: doc/APIchanges doc/examples/decoding_encoding.c libavcodec/utils.c libavcodec/version.h libavfilter/src_movie.c libavformat/oggdec.c libavformat/oggdec.h libavformat/oggparsetheora.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-25Fix two "skiping" typo.Clément Bœsch
2012-09-21ffmpeg: complete mov/mp4 based timebase hack with "f4v" format.Clément Bœsch
2012-09-15ffmpeg: use PTS from the AVSubtitle structure for sub2video.Nicolas George
2012-09-15ffmpeg: use PTS from the AVSubtitle structure.Nicolas George
2012-09-15ffmpeg: call sub2video_update for end packets.Nicolas George
Without that change, all subtitles will stay until the next one.
2012-09-12ffmpeg: Only include unistd.h if it existsDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-10ffmpeg: check timebase validity before considering it to be used for stream copyMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-10ffmpeg: fix bytes written statistics.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-31Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'Michael Niedermayer
* commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5': x86: Fix linking with some or all of yasm, mmx, optimizations disabled configure: Add more fine-grained SSE CPU capabilities flags avfilter: x86: Use more precise compile template names x86: cosmetics: Comment some #endifs for better readability g723_1: add comfort noise generation utvideoenc: Switch to dsputils' median prediction utvideoenc: Avoid writing into the input picture avtools: remove the distinction between func_arg and func2_arg. avconv: make the -passlogfile option per-stream. avconv: make the -pass option per-stream. cmdutils: make -codecs print lossy/lossless flags. lavc: add lossy/lossless codec properties. Conflicts: Changelog cmdutils.c configure doc/APIchanges ffmpeg.h ffmpeg_opt.c ffprobe.c libavcodec/codec_desc.c libavcodec/g723_1.c libavcodec/utvideoenc.c libavcodec/version.h libavcodec/x86/mpegaudiodec.c libavcodec/x86/rv40dsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-02 21:59:00 +0300