summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
* ffmpeg: fix double ;;Michael Niedermayer2012-11-14
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: fix audio timestamps on stream copy with -ssMichael Niedermayer2012-11-14
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Fix the packet duration when flushing the encoder.Thierry Foucu2012-11-07
| | | | | | | | | | | | A similar patch was posted by Justin Ruggles <justin.ruggles@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'Michael Niedermayer2012-11-03
|\| | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge commit '381dc1a5ec0925b281c573457c413ae643567086'Michael Niedermayer2012-10-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | ffmpeg: use av_rescale_delta() for audio stream copyMichael Niedermayer2012-10-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use av_rescale_delta() on the audio filter inputMichael Niedermayer2012-10-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: trivial simplificationMichael Niedermayer2012-10-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'Michael Niedermayer2012-10-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | ffmpeg: fix null ptr deref in psnr printing codeMichael Niedermayer2012-10-25
| | | | | | | | | | Fixes CID205005 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'Michael Niedermayer2012-10-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | ffmpeg: check avpicture_get_size() retuen valueMichael Niedermayer2012-10-23
| | | | | | | | | | Fixes CID205018 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg/lavc: move experimental warnings to libavcodec.Michael Niedermayer2012-10-22
| | | | | | | | | | | | This way they are available to all applications and not just ffmpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4'Michael Niedermayer2012-10-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | ffmpeg: Make video filter graph reinit user selectableMichael Niedermayer2012-10-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'Michael Niedermayer2012-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'Michael Niedermayer2012-10-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | fix exit_program() prototypesMichael Niedermayer2012-10-02
| | | | | | | | | | | | This fixes 2 warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | ffmpeg: print muxed packet sizes in debug output tooMichael Niedermayer2012-10-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: disable buffering for stderr, needed for win32 runtimeThe makemkv authors2012-09-30
| | | | | | | | | | | | | | 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>
* | ffmpeg: add option to control copying of frames prior to start.Michael Niedermayer2012-09-27
| | | | | | | | | | | | | | | | | | | | | | 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>
* | ffmpeg: allow printing muxer side packet timestamp debuging infoMichael Niedermayer2012-09-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'Michael Niedermayer2012-09-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Fix two "skiping" typo.Clément Bœsch2012-09-25
| |
* | ffmpeg: complete mov/mp4 based timebase hack with "f4v" format.Clément Bœsch2012-09-21
| |
* | ffmpeg: use PTS from the AVSubtitle structure for sub2video.Nicolas George2012-09-15
| |
* | ffmpeg: use PTS from the AVSubtitle structure.Nicolas George2012-09-15
| |
* | ffmpeg: call sub2video_update for end packets.Nicolas George2012-09-15
| | | | | | | | Without that change, all subtitles will stay until the next one.
* | ffmpeg: Only include unistd.h if it existsDerek Buitenhuis2012-09-11
| | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: check timebase validity before considering it to be used for stream copyMichael Niedermayer2012-09-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix bytes written statistics.Michael Niedermayer2012-09-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'Michael Niedermayer2012-08-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | ffmpeg: count finished streams for last stats line.Nicolas George2012-08-28
| | | | | | | | Otherwise, all streams are finished and the time is nonsensical.
* | ffmpeg: report max time of unfinished streams in stats.Nicolas George2012-08-28
| | | | | | | | | | | | | | | | Eliminating finished streams avoids the progress stopping with the first stream. Using the max instead of the min avoids the progress stopping with gaps in sparse streams (subtitles). Negligible change for normal circumstances.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: audio_frame_queue: Clean up ff_af_queue_log_state debug function dwt: Remove unused code. cavs: convert cavsdata.h to a .c file cavs: Move inline functions only used in one file out of the header cavs: Move data tables used in only one place to that file fate: Add a single symbol Ut Video decoder test vf_hqdn3d: x86 asm vf_hqdn3d: support 16bit colordepth avconv: prefer user-forced input framerate when choosing output framerate Conflicts: ffmpeg.c libavcodec/audio_frame_queue.c libavcodec/dwt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix wrap correction code.Michael Niedermayer2012-08-24
| | | | | | | | | | | | The code failed with negative timestamps due to using unsigned numbers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use close_output_stream more systematically.Nicolas George2012-08-22
| |
* | ffmpeg: move close_output_stream earlier.Nicolas George2012-08-22
| | | | | | | | It will avoid a forward declaration.
* | ffmpeg: make decoding_needed a counter.Nicolas George2012-08-22
| |
* | ffmpeg: use AV_BUFFERSRC_FLAG_PUSH.Nicolas George2012-08-22
| | | | | | | | | | It reduces the lifespan of buffers in filter graphs, and therefore the memory consumption.
* | ffmpeg: remove useless flags to EOF av_buffersrc_add_ref.Nicolas George2012-08-20
| |
* | fix spellingrogerdpack2012-08-20
| | | | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: reindent after last commit.Nicolas George2012-08-19
| |
* | ffmpeg: reduce differences with avconv for in/out scheduling.Nicolas George2012-08-19
| | | | | | | | | | | | | | | | Rework the transcode() function and its immediate annexes to have the same structure as in avconv, while still maintaining proper scheduling to avoid accumulation. Using -filter_complex without inputs now works.
* | ffmpeg: Clip invalid video timestamps like audio instead of failing hard.Michael Niedermayer2012-08-19
| | | | | | | | | | | | Fixes Ticket976 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo_enc: don't use deprecated avcodec_encode_video(). cmdutils: refactor -codecs option. avconv: make -shortest a per-output file option. lavc: add avcodec_descriptor_get_by_name(). lavc: add const to AVCodec* function parameters. swf(dec): replace CODEC_ID with AV_CODEC_ID dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE rtmpdh: Do not generate the same private key every time when using libnettle rtp: remove ff_rtp_get_rtcp_file_handle(). rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle() avio: add (ff)url_get_multi_file_handle() for getting more than one fd h264: vdpau: fix crash with unsupported colorspace amrwbdec: Decode the fr_quality bit properly Conflicts: Changelog cmdutils.c cmdutils_common_opts.h doc/ffmpeg.texi ffmpeg.c ffmpeg.h ffmpeg_opt.c libavcodec/h264.c libavcodec/options.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: g723.1: simplify scale_vector() g723.1: simplify normalize_bits() vda: cosmetics: fix Doxygen comment formatting vda: better frame allocation vda: Merge implementation into one file vda: support synchronous decoding vda: Reuse the bitstream buffer and reallocate it only if needed build: Factor out mpegvideo encoding dependencies to CONFIG_MPEGVIDEOENC avprobe: Include libm.h for the log2 fallback proresenc: use the edge emulation buffer rtmp: handle bytes read reports configure: Fix typo in mpeg2video/svq1 decoder dependency declaration Use log2(x) instead of log(x) / log(2) x86: swscale: fix fragile memory accesses x86: swscale: remove disabled code x86: yadif: fix asm with suncc x86: cabac: allow building with suncc x86: mlpdsp: avoid taking address of void ARM: intmath: use native-size return types for clipping functions Conflicts: configure ffprobe.c libavcodec/Makefile libavcodec/g723_1.c libavcodec/v210dec.h libavcodec/vda.h libavcodec/vda_h264.c libavcodec/x86/cabac.h libavfilter/x86/yadif_template.c libswscale/x86/rgb2rgb_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 23:49:30 +0000