aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'khirnov/release/0.7' into release/0.8Michael Niedermayer2011-09-221-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * khirnov/release/0.7: (64 commits) rv34: Check for invalid slice offsets rv34: Fix potential overreads rv34: Avoid NULL dereference on corrupted bitstream rv10: Reject slices that does not have the same type as the first one lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails oggdec: fix out of bound write in the ogg demuxer Fixed size given to init_get_bits(). smacker: fix a few off by 1 errors Check for invalid VLC value in smacker decoder. Check and propagate errors when VLC trees cannot be built in smacker decoder. Fixed off by one packet size allocation in the smacker demuxer. Check for invalid packet size in the smacker demuxer. ape demuxer: fix segfault on memory allocation failure. xan: Add some buffer checks (cherry picked from commit 0872bb23b4bd2d94a8ba91070f706d1bc1c3ced8) Fixed size given to init_get_bits() in xan decoder. (cherry picked from commit 393d5031c6aaaf8c2dda4eb5d676974c349fae85) smacker demuxer: handle possible av_realloc() failure. Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks. cljr: init_get_bits size in bits instead of bytes (cherry picked from commit 0c1f5b93d9b97c4cc3684ba91a040e90bfc760d2) indeo2: fail if input buffer too small (cherry picked from commit b7ce4f1d1c3add86ece7ca595ea6c4a10b471055) indeo2: init_get_bits size in bits instead of bytes (cherry picked from commit 68ca330cbd479111db9cb7649d7530ad59f04cc8) ... Conflicts: ffmpeg.c libavdevice/alsa-audio.h libavformat/gxf.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Revert "ffmpeg: get rid of useless AVInputStream.nb_streams."Anton Khirnov2011-09-111-3/+5
| | | | | | | | | | | | | | | | | | This reverts commit 2cf8355f98681bdd726b739008acd5483f82f8d7. AVInputStream.nb_streams tracks number of streams found at the beginning, new streams may appear that ffmpeg doesn't know about. Fixes crash in this case. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Make all option parsing functions match the function pointer type through ↵Jeff Downs2011-09-071-6/+11
| | | | | | | | | | | | | | | | | | which they are called. All option parsing functions now match the function pointer signature through which they are called (int f(const char *, const char *), thereby working reliably on all platforms. Prefix all option processing functions with opt_
* | Fix possible crash when decoding mpeg streams.Carl Eugen Hoyos2011-08-041-2/+4
| | | | | | | | | | This reverts 2cf8355f98681bdd726b739008acd5483f82f8d7, fixes ticket 329.
* | ffmpeg: fix passlogfile regressionn0.8.1Michael Niedermayer2011-07-281-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2.Baptiste Coudurier2011-07-271-3/+3
| | | | | | | | (cherry picked from commit 90a40b226a5c90e48da8041294c3782de6ee61fc)
* | Merge remote-tracking branch 'qatar/release/0.7' into release/0.8Michael Niedermayer2011-07-261-5/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/release/0.7: (65 commits) riff: Add mpgv MPEG-2 fourcc Update Changelog matroskadec: fix integer underflow if header length < probe length. ffmpeg: fix operation with --disable-avfilter vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h build: Create mlib optimization directories during out-of-tree builds. changelog: misc typo and wording fixes (cherry picked from commit b047941d7da470ba0dcedb1fd0aa828075265ffc) doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. (cherry picked from commit 5ccbf80963c1cc54aed97b1c81b1657ab91baf6a) matroskadec: matroska_read_seek after after EBML_STOP leads to failure. Update RELEASE file update Changelog mt: proper locking around release_buffer calls. vp8/mt: flush worker thread, not application thread context, on seek. docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue docs: Use proper markup for a literal command line option docs: Don't recommend adding --enable-memalign-hack docs: Remove needless configure options oggdec: prevent heap corruption. oggdec: Abort Ogg header parsing when encountering a data packet. Add LGPL license boilerplate to files lacking it. ... Conflicts: Changelog configure doc/developer.texi libavcodec/libvpxenc.c libavcodec/rawdec.c libavfilter/x86/gradfun.c libavformat/Makefile libavformat/isom.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: fix operation with --disable-avfilterMans Rullgard2011-07-211-4/+7
| | | | | | | | | | | | | | | | The width and height must be copied from the input before being used. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit e9f98c90229999c0e654bd77af55d7020347440a)
| * ffmpeg: use av_get_bytes_per_sample() in place of av_get_bits_per_sample_fmt()Stefano Sabatini2011-07-031-1/+1
| | | | | | | | | | | | | | av_get_bits_per_sample_fmt() was deprecated. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit f6d6783a4df127d2ad1cf755ac4f363decbd7fbb)
* | Fix zero-length gnu_printf format string warning.Clément Bœsch2011-06-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-211-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). x86: cabac: fix register constraints for 32-bit mode cabac: move x86 asm to libavcodec/x86/cabac.h x86: h264: cast pointers to intptr_t rather than int x86: h264: remove hardcoded edi in decode_significance_8x8_x86() x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86() x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86() x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86() x86: cabac: change 'a' constraint to 'r' in get_cabac_inline() x86: cabac: remove hardcoded esi in get_cabac_inline() x86: cabac: remove hardcoded edx in get_cabac_inline() x86: cabac: remove unused macro parameter x86: cabac: remove hardcoded ebx in inline asm x86: cabac: remove hardcoded struct offsets from inline asm cabac: remove inline asm under #if 0 cabac: remove BRANCHLESS_CABAC_DECODER switch cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED document libswscale bump error_resilience: skip last-MV predictor step if MVs are not available. error_resilience: actually add counter when adding a MV predictor. ... Conflicts: Changelog libavcodec/error_resilience.c libavfilter/defaults.c libavfilter/vf_drawtext.c libswscale/swscale.h tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().Justin Ruggles2011-06-201-3/+3
| |/ | | | | | | av_get_bits_per_sample_fmt() is deprecated.
* | ffmpeg: print warning if encoding would duplicate massive amounts of framesMichael Niedermayer2011-06-201-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: add vsink_buffer, and use it in ff* toolsStefano Sabatini2011-06-191-8/+12
| | | | | | | | Also add the public interface libavfilter/vsink_buffer.h.
* | ffmpeg: warn if samples need to be converted in a lossy way for lossless ↵Michael Niedermayer2011-06-191-0/+2
| | | | | | | | | | | | encoders. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-181-16/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: add opt_find to AVCodecContext class. h264: Complexify frame num gap shortening code intreadwrite.h: fix AV_RL32/AV_RB32 signedness. Fix decoding of mpegts streams with h264 video that does *NOT* have b frames Add minor bumps and APIChanges entries for lavf private options. ffmpeg: deprecate -vc and -tvstd ffmpeg: use new avformat_open_* API. ffserver: use new avformat_open_* API. ffprobe: use new avformat_open_* API. ffplay: use new avformat_open_* API. cmdutils: add opt_default2(). dict: add AV_DICT_APPEND flag. lavf: add avformat_write_header() as a replacement for av_write_header(). Deprecate av_open_input_* and remove their uses. lavf: add avformat_open_input() as a replacement for av_open_input_* AVOptions: add av_opt_find() as a replacement for av_find_opt. AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context. ffmpeg: don't abuse a global for passing frame size from input to output ffmpeg: don't abuse a global for passing pixel format from input to output ffmpeg: initialise encoders earlier. Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c ffprobe.c libavcodec/h264.c libavformat/avformat.h libavformat/utils.c libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: deprecate -vc and -tvstdAnton Khirnov2011-06-161-10/+6
| | | | | | | | They've been replaced by demuxer private options.
| * ffmpeg: use new avformat_open_* API.Anton Khirnov2011-06-161-30/+47
| |
| * ffmpeg: don't abuse a global for passing frame size from input to outputAnton Khirnov2011-06-161-6/+10
| | | | | | | | It's broken with multiple files or video streams.
| * ffmpeg: don't abuse a global for passing pixel format from input to outputAnton Khirnov2011-06-161-3/+5
| | | | | | | | It's broken with multiple files or video streams.
| * ffmpeg: initialise encoders earlier.Anton Khirnov2011-06-161-6/+6
| | | | | | | | Fixes choosing supported samplerate and framerate.
* | Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'Michael Niedermayer2011-06-171-11/+7
|\| | | | | | | | | | | | | | | | | | | | | * commit '9446d75941d639f19cfa9ae007eb4c5ca041f200': ffmpeg: merge output_codecs array into AVOutputStream members. rtpenc_latm: Consistently use "Libav" in license boilerplate. rtsp: Don't pass string pointer as format string to ff_url_join mmsh: fixed printf injection bug in mmsh request codec-regression: remove pointless -r options for dnxhd Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: merge output_codecs array into AVOutputStream members.Anton Khirnov2011-06-161-11/+7
| | | | | | | | There's no point in keeping them separate.
* | ffmpeg: Force 420 with target dvd and svcd.Michael Niedermayer2011-06-161-0/+2
| | | | | | | | | | | | Fixes ticket283 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-161-26/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ac3enc: use correct alignment and length in channel coupling dsp functions. ffmpeg: don't abuse a global for passing framerate from input to output ffmpeg: don't abuse a global for passing channels from input to output ffmpeg: don't abuse a global for passing samplerate from input to output ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes swscale: use SwsContext for av_log when available swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled. swscale: Fix compilation with --disable-mmx2. Conflicts: ffmpeg.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: don't abuse a global for passing framerate from input to outputAnton Khirnov2011-06-151-9/+13
| | | | | | | | It's broken with multiple files or video streams.
| * ffmpeg: don't abuse a global for passing channels from input to outputAnton Khirnov2011-06-151-6/+9
| | | | | | | | It's broken with multiple files or audio streams.
| * ffmpeg: don't abuse a global for passing samplerate from input to outputAnton Khirnov2011-06-151-11/+13
| | | | | | | | | | | | | | It's broken with multiple files or audio streams. This removes the default samplerate of 44100 for raw input, hence all the FATE changes.
| * ffmpeg: fix streaming to ffserver.Ronald S. Bultje2011-06-141-0/+1
| |
| * ffmpeg.c: Add a necessary const qualifierAlex Converse2011-06-091-1/+1
| |
* | avfiltergraph: make the AVFilterInOut alloc/free API publicStefano Sabatini2011-06-121-2/+2
| | | | | | | | | | This is required for letting applications to create and destroy AVFilterInOut structs in a convenient way.
* | avfiltergraph: change the syntax of avfilter_graph_parse()Stefano Sabatini2011-06-121-1/+1
| | | | | | | | | | | | | | Make it returns the list of open inputs and outputs, so it can be reused by applications. Breaks API/ABI.
* | Fix -t option for formats which holds dts and no ptsEtienne Buira2011-06-111-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-091-14/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: crypto: Use av_freep instead of av_free lavf: don't try to free private options if priv_data is NULL. swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. Conflicts: doc/APIchanges libavformat/aiffdec.c libavformat/asfdec.c libavformat/avformat.h libavformat/avidec.c libavformat/cafdec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/wtv.c libavutil/avutil.h libavutil/internal.h libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove all uses of now deprecated metadata functions.Anton Khirnov2011-06-081-14/+15
| |
* | Move code for "ffmpeg: fix massive leak occurring when seeking" / ↵Michael Niedermayer2011-06-061-8/+16
| | | | | | | | | | | | | | | | e4841a404bdabfeafb917454d510b60d888cb761 elsewhere The picture struct is written to in the loop, so this cannot work. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vsrc_buffer: add flags param to av_vsrc_buffer_add_video_buffer_refStefano Sabatini2011-06-061-1/+2
| | | | | | | | | | | | | | The new flags parameter allows to specify if the video ref to add should overwrite the cache, if the flag is not set vsrc_buffer will complain and abort; otherwise it will clean the already cached video ref before to overwrite it, thus avoiding a leak.
* | ffmpeg: fix massive leak occurring when seekingStefano Sabatini2011-06-051-15/+7
| | | | | | | | | | | | | | | | | | Avoid to add frames to the vsrc_buffer in the case ist->pts < start_time, as these frames are unused (and never released). In particular this condition is verified with commands of the kind: ffmpeg -i INPUT -ss TIME OUTPUT Also allow a minor simplification.
* | cmdutils: change the signature of the function argument in parse_options()Stefano Sabatini2011-06-051-1/+2
| | | | | | | | This is required for a pending simplification.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-041-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) build: simplify commands for clean target swscale: split swscale.c in unscaled and generic conversion routines. swscale: cosmetics. swscale: integrate (literally) swscale_template.c in swscale.c. swscale: split out x86/swscale_template.c from swscale.c. swscale: enable hScale_altivec_real. swscale: split out ppc _template.c files from main swscale.c. swscale: remove indirections in ppc/swscale_template.c. swscale: split out unscaled altivec YUV converters in their own file. mpegvideoenc: fix multislice fate tests with threading disabled. mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro. build: Simplify texi2html invocation through the --output option. Mark some variables with av_unused Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name(). svq3: Check negative mb_type to fix potential crash. svq3: Move svq3-specific fields to their own context. rawdec: initialize return value to 0. Remove unused get_psnr() prototype rawdec: don't leak option strings. bktr: get default framerate from video standard. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name().Stefano Sabatini2011-06-031-2/+2
| | | | | | | | | | This fixes warnings about avcodec_get_pix_fmt_name() being deprecated. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | ffmpeg: use opt_acodec when setting audio codec in opt_target.Baptiste Coudurier2011-06-031-2/+2
| |
* | ffmpeg: fix segfault with too many output filesMichael Niedermayer2011-06-041-0/+5
| | | | | | | | | | | | Fixes Ticket219 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-031-3/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (25 commits) Replace custom DEBUG preprocessor trickery by the standard one. vorbis: Remove non-compiling debug statement. vorbis: Remove pointless DEBUG #ifdef around debug output macros. cook: Remove non-compiling debug output. Remove pointless #ifdefs around function declarations in a header. Replace #ifdef + av_log() combinations by av_dlog(). Replace custom debug output functions by av_dlog(). cook: Remove unused debug functions. Remove stray extra arguments from av_dlog() invocations. targa: fix big-endian build v4l2: remove one forgotten use of AVFormatParameters.pix_fmt. vfwcap: add a framerate private option. v4l2: add a framerate private option. libdc1394: add a framerate private option. fbdev: add a framerate private option. bktr: add a framerate private option. oma: check avio_read() return value nutdec: remove unused variable Remove unused variables swscale: allocate larger buffer to handle altivec overreads. ... Conflicts: ffmpeg.c libavcodec/dca.c libavcodec/dirac.c libavcodec/error_resilience.c libavcodec/h264.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pthread.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/shorten.c libavcodec/truemotion2.c libavcodec/utils.c libavdevice/dv1394.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/4xm.c libavformat/apetag.c libavformat/asfdec.c libavformat/avidec.c libavformat/mmf.c libavformat/mpeg.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/oggdec.c libavformat/oggparseogm.c libavformat/rl2.c libavformat/rmdec.c libavformat/rpl.c libavformat/rtpdec_latm.c libavformat/sauce.c libavformat/sol.c libswscale/utils.c tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove unused variablesMans Rullgard2011-06-021-5/+3
| |
* | In print_report, print progression time in hours:mins:secs:usBaptiste Coudurier2011-06-031-2/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: In print_report, use int64_t for pts to check for 0 and avoid inf ↵Baptiste Coudurier2011-06-031-9/+6
| | | | | | | | | | | | value for bitrate. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: handle copy of packets for AVFMT_RAWPICTURE output formatsStefano Sabatini2011-06-011-0/+8
| | | | | | | | | | | | Store AVPicture in AVPacket as required by AVFMT_RAWPICTURE formats. Fix trac issue #251.
* | ffmpeg: simplify opt_*_codec() optionsStefano Sabatini2011-05-301-40/+23
| | | | | | | | | | Replace opt_{audio,video,subtitle,data}_codec() with a single opt_codec() function.
* | Fix various unused variable warningsClément Bœsch2011-05-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 23:01:52 +0000