aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * ffmpeg: fix operation with --disable-avfilterMans Rullgard2011-07-171-4/+7
| | | | | | | | | | | | | | The width and height must be copied from the input before being used. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Revert "ffmpeg: get rid of a pointless limit on number of streams."Michael Niedermayer2011-07-161-1/+4
| | | | | | | | | | | | | | | | This reverts commit c7dd3e7e43555b2922481a9242a306c5b138d69c Conflicts: ffmpeg.c
* | ffmpeg: fix muxer private options (bug introduced by anton khirnov)Michael Niedermayer2011-07-151-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: Automatically add more flags required on symbian mem.h: switch doxygen parameter order to match function prototype doxygen: replace @sa tag by the more readable but equivalent @see doxygen: use Doxygen markup for authors and web links where appropriate doxygen: do not include license boilerplate in Doxygen documentation ac3enc: Mark AVClasses const ffserver: Replace two loops with one loop. ffmpeg: Fix the check for experimental codecs swscale: extend mmx padding. swscale: clip unscaled colorspace conversion path. doxygen: misc consistency cosmetics doc: remove file name from @file directive in Doxygen usage example doxygen: consistently place brief description doxygen: place empty line between brief description and detailed description avformat_open_input(): Add braces to shut up gcc warning. Conflicts: libavcodec/8svx.c libavcodec/tiff.c libavcodec/tiff.h libavcodec/vaapi_h264.c libavcodec/vorbis.c libavcodec/vorbisdec.c libavcodec/vp6.c libswscale/swscale_unscaled.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: Fix the check for experimental codecsMartin Storsjö2011-07-141-1/+1
| | | | | | | | | | | | The variable 'codec' was used uninitialized here. Signed-off-by: Martin Storsjö <martin@martin.st>
* | ffmpeg: loose lowres hackeryMichael Niedermayer2011-07-141-4/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-141-54/+52
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: APIchanges: fill in missing hashes and dates. Add an APIChanges entry and bump minor versions for recent changes. ffmpeg: print the low bitrate warning after the codec is openend. doxygen: Move function documentation into the macro generating the function. doxygen: Make sure parameter names match between .c and .h files. h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h H.264: Add more x86 assembly for 10-bit H.264 predict functions lavf: fix invalid reads in avformat_find_stream_info() cmdutils: replace opt_default with opt_default2() and remove set_context_opts ffmpeg: use new avcodec_open2 and avformat_find_stream_info API. ffplay: use new avcodec_open2 and avformat_find_stream_info API. cmdutils: store all codec options in one dict instead of video/audio/sub ffmpeg: check experimental flag after codec is opened. ffmpeg: do not set GLOBAL_HEADER flag in the options context Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c libavcodec/version.h libavformat/version.h libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: print the low bitrate warning after the codec is openend.Anton Khirnov2011-07-141-15/+3
| | | | | | | | | | | | | | This doesn't access avcodec_opts, so it works with the new options passing system. Makes opt_bitrate() unneeded, so it's removed.
| * ffmpeg: use new avcodec_open2 and avformat_find_stream_info API.Anton Khirnov2011-07-131-25/+22
| |
| * ffmpeg: check experimental flag after codec is opened.Anton Khirnov2011-07-131-26/+26
| | | | | | | | | | This doesn't access avcodec_opts, so it will work with the new options passing system.
| * ffmpeg: do not set GLOBAL_HEADER flag in the options contextAnton Khirnov2011-07-131-4/+0
| | | | | | | | | | The removed lines have no effect, since the flag is set on all encoder for the given file and avcodec_opts are reset between files.
* | ffmpeg: deprecate -vc and -tvstdAnton Khirnov2011-07-141-10/+6
| | | | | | | | | | | | They've been replaced by demuxer private options. 55ba12e3009fd6c8f78102f7c747496d500d0bac
* | ffmpeg: use new avformat_open_* API.Anton Khirnov2011-07-141-36/+48
| | | | | | | | 8035f429684e368fe54af8ccedc2d4776a2d6154
* | Merge commit 'b5849f77095439e994b11c25e6063d443b36c228'Michael Niedermayer2011-07-141-11/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b5849f77095439e994b11c25e6063d443b36c228': (21 commits) ac3enc: merge AC3MDCTContext with AC3EncodeContext. ac3enc: prefer passing AC3EncodeContext rather than AVCodecContext ac3enc: fix memleak mpeg1video: add CODEC_CAP_SLICE_THREADS. lavf: fix segfault in av_open_input_stream() mpegtsenc: set Random Access indicator on keyframe start packets lavf: Cleanup try_decode_frame() logic. Replace some gotos that lead to single return statements by direct return. build: move tests/seek_test.c to libavformat and reuse generic build rules mxfenc: include needed header for ff_iso8601_to_unix_time() prototype Add a check for strptime(). lavf: factor out conversion of ISO8601 string to unix time wav: parse 'bext' metadata wav: keep parsing until EOF if the input is seekable and we know the size of the data tag wav: Refactor the tag checking into a switch statement wav: make sure neither data_size nor sample_count is negative. wav: refactor the 'fmt ' tag search and parsing. wav: add an option for writing BEXT chunk ffmpeg: get rid of a pointless limit on number of streams. ffmpeg: remove an unused define. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace some gotos that lead to single return statements by direct return.Diego Biurrun2011-07-131-6/+4
| |
| * ffmpeg: get rid of a pointless limit on number of streams.Anton Khirnov2011-07-131-5/+1
| |
| * ffmpeg: remove an unused define.Anton Khirnov2011-07-131-2/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-131-74/+57
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doc: Improve references to external URLs. h264: move decode_mb_skip() from h264.h to h.264_mvpred.h ffplay: skip return value of avcodec_decode_video2 / avcodec_decode_subtitle2 dnxhdenc: Replace a forward declaration by the proper #include. h264: move h264_mvpred.h include. pix_fmt: Fix number of bits per component in yuv444p9be lavf: deprecate AVFormatContext.timestamp ffmpeg: merge input_files_ts_scale into InputStream. ffmpeg: don't abuse a global for passing sample format from input to output ffmpeg: don't abuse a global for passing channel layout from input to output ffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream() matroskaenc: make SSA default subtitle codec. oggdec: prevent heap corruption. Conflicts: doc/developer.texi doc/faq.texi doc/general.texi ffmpeg.c ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: deprecate AVFormatContext.timestampAnton Khirnov2011-07-121-7/+8
| | | | | | | | It's replaced by 'creation_time' metadata tag.
| * ffmpeg: merge input_files_ts_scale into InputStream.Anton Khirnov2011-07-121-9/+13
| |
| * ffmpeg: don't abuse a global for passing sample format from input to outputAnton Khirnov2011-07-121-3/+7
| | | | | | | | It's broken with multiple files or audio streams.
| * ffmpeg: don't abuse a global for passing channel layout from input to outputAnton Khirnov2011-07-121-3/+1
| | | | | | | | It's broken with multiple files or audio streams.
| * ffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream()Anton Khirnov2011-07-121-52/+28
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-091-105/+102
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) mp3enc: write a xing frame containing number of frames in the file lavf: update AVStream.nb_frames when muxing. ffmpeg: remove unused variables from InputStream. doc: update ffmpeg -ar and -ac documentation to reflect reality. ffmpeg: remove pointless if (nb_input_files) ffmpeg: merge input_files_ts_offset into input_files. ffmpeg: merge input_codecs into input_streams. ffmpeg: drop AV prefixes from struct names. ffmpeg: deprecate loop_input and loop_output options gif: add loop private option. img2: add loop private option. AVOptions: in av_opt_find() don't return named constants unless unit is specified. x11grab: replace undocumented nomouse hackery with a private option. dict: extend documentation. lls: whitespace cosmetics docs: Use proper markup for a literal command line option docs: Remove a remark that isn't relevant any longer docs: Explain how to regenerate import libraries with MSVC tools docs: Mention that libraries for MSVC can be built with a cross compiler docs: Remove old docs that mention setting up a build environment with lib.exe ... Conflicts: doc/ffmpeg.texi doc/general.texi ffmpeg.c libavcodec/Makefile libavcodec/dnxhddata.c libavformat/mp3enc.c libavformat/utils.c libavutil/Makefile tests/copycooker.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: remove unused variables from InputStream.Anton Khirnov2011-07-081-5/+0
| |
| * ffmpeg: remove pointless if (nb_input_files)Anton Khirnov2011-07-081-17/+14
| | | | | | | | | | It's required to be non-zero since cc58300e30e7aea6acfecd72a04a3886b285cfd8
| * ffmpeg: merge input_files_ts_offset into input_files.Anton Khirnov2011-07-081-9/+10
| |
| * ffmpeg: merge input_codecs into input_streams.Anton Khirnov2011-07-081-10/+7
| | | | | | | | There's no point in keeping them separate.
| * ffmpeg: drop AV prefixes from struct names.Anton Khirnov2011-07-081-54/+54
| | | | | | | | Those are reserved for the libs.
| * ffmpeg: deprecate loop_input and loop_output optionsAnton Khirnov2011-07-081-4/+10
| | | | | | | | They were replaced by (de)muxer private options.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-061-7/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffserver: remove unused variable. Remove unused and outdated TODO file. gitignore: Drop individual .d ignore; it is already covered by a wildcard. lavf: deprecate AVStream.quality. bink: pass Bink version to audio decoder through extradata instead of codec_tag. libpostproc: Remove disabled code. flashsv: improve some comments and fix some wrong ones flashsv: Eliminate redundant variable indirection. flashsv: set reference frame type to full frame flashsv: replace bitstream description by a link to the specification flashsv: convert a debug av_log into av_dlog flashsv: simplify condition flashsv: return more meaningful error values flashsv: cosmetics: break some overly long lines flashsv: cosmetics: drop some unnecessary parentheses swscale: amend documentation to mention use of native depth for scaling. eval: add missing comma to tests. eval: fix memleak. H.264: make loopfilter bS const where applicable Conflicts: libavcodec/binkaudio.c libavformat/bink.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: deprecate AVStream.quality.Anton Khirnov2011-07-061-7/+8
| | | | | | | | AVStream is no place for it and it's unused outside of ffmpeg anyway.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-041-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (40 commits) H.264: template left MB handling H.264: faster fill_decode_caches H.264: faster write_back_* H.264: faster fill_filter_caches H.264: make filter_mb_fast support the case of unavailable top mb Do not include log.h in avutil.h Do not include pixfmt.h in avutil.h Do not include rational.h in avutil.h Do not include mathematics.h in avutil.h Do not include intfloat_readwrite.h in avutil.h Remove return statements following infinite loops without break RTSP: Doxygen comment cleanup doxygen: Escape '\' in Doxygen documentation. md5: cosmetics md5: use AV_WL32 to write result md5: add fate test md5: include correct headers md5: fix test program doxygen: Drop array size declarations from Doxygen parameter names. doxygen: Fix parameter names to match the function prototypes. ... Conflicts: libavcodec/x86/dsputil_mmx.c libavformat/flvenc.c libavformat/oggenc.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Do not include mathematics.h in avutil.hMans Rullgard2011-07-031-0/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-031-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ARM: ac3: update ff_ac3_extract_exponents_neon per 8b7b2d6 ARM: NEON optimised vector_clip_int32() swscale: disable full_chroma_int when converting to non-24/32bpp RGB. suggest to use av_get_bytes_per_sample() in av_get_bits_per_sample_format() doxy ffmpeg: use av_get_bytes_per_sample() in place of av_get_bits_per_sample_fmt() put_bits: remove ALT_BITSTREAM_WRITER put_bits: always use intreadwrite.h macros libavformat: Add an example how to use the metadata API doxygen: Prefer member groups over grouping into modules doxygen: be more permissive when searching for API examples avformat: doxify the Metadata API lavf: restore old behavior for custom AVIOContex with an AVFMT_NOFILE format. lavf: use the correct pointer in av_open_input_stream(). avidec: infer absolute vs relative index from first packet Conflicts: libavformat/Makefile libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: use av_get_bytes_per_sample() in place of av_get_bits_per_sample_fmt()Stefano Sabatini2011-07-021-1/+1
| | | | | | | | | | | | av_get_bits_per_sample_fmt() was deprecated. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Make all option parsing functions match the function pointer type through ↵Jeff Downs2011-06-301-5/+9
| | | | | | | | | | | | | | | | | | 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_
* | Set channel_layout if channels is set when transcoding.Carl Eugen Hoyos2011-06-291-1/+3
| |
* | ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2.Baptiste Coudurier2011-06-261-3/+3
| |
* | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-13 07:00:38 +0000