summaryrefslogtreecommitdiffstats
path: root/libavutil
Commit message (Collapse)AuthorAgeFilesLines
* avopt: Fix searching for constantsMichael Niedermayer2011-09-081-1/+1
| | | | | | Fixes Ticket350 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-073-15/+25
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Add LATM muxer v210enc: clip values according to specifications v210enc: switch to PIX_FMT_422P10 v210dec: switch to PIX_FMT_422P10 AVOptions: remove AVOption.offset <= 0 checks AVOptions: deprecate av_opt_set_defaults2 AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h libx264: fix setting some more parameters libx264: fix setting the H.264 level libx264: add 'direct-pred' private option libx264: add 'partitions' private option Conflicts: Changelog libavcodec/Makefile libavcodec/libx264.c libavcodec/v210enc.c libavfilter/src_movie.c libavformat/version.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVOptions: remove AVOption.offset <= 0 checksAnton Khirnov2011-09-071-4/+4
| | | | | | | | | | They will only ever be <=0 if the option is broken, in which case this check is hiding a bug.
| * AVOptions: deprecate av_opt_set_defaults2Anton Khirnov2011-09-073-6/+17
| | | | | | | | | | | | It's a hack which was created to allow for multiple options with different defaults to refer to same field (e.g. 'b' vs 'ab'). There is no need for it anymore.
| * AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.hAnton Khirnov2011-09-072-6/+5
| | | | | | | | Also change it to be more readable.
* | av_string: add av_asprintf().Clément Bœsch2011-09-043-1/+37
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-043-3/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: AVOptions: fix av_set_string3() doxy to match reality. cmdutils: get rid of dummy contexts for examining AVOptions. lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions. AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find(). cpu detection: avoid a signed overflow Conflicts: avconv.c cmdutils.c doc/APIchanges ffmpeg.c libavcodec/options.c libavcodec/version.h libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVOptions: fix av_set_string3() doxy to match reality.Anton Khirnov2011-09-031-1/+1
| | | | | | | | Fixes bug 28.
| * AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find().Anton Khirnov2011-09-032-1/+10
| | | | | | | | | | It allows to search for options only with AVClass, without allocating the corresponding context.
| * cpu detection: avoid a signed overflowSean McGovern2011-09-031-1/+1
| | | | | | | | | | | | 1<<31 overflows because 1 is signed, so force it to unsigned. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-011-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: avconv: fix some bugs introduced in 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660 libmp3lame: fix typo AVOptions: drop av_ prefix from static av_get_number(). libx264: use X264_THREADS_AUTO constant instead of 0. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVOptions: drop av_ prefix from static av_get_number().Anton Khirnov2011-09-011-4/+4
| |
* | fifo: add note in av_fifo_realloc2() doxy regarding reallocation failure ↵Stefano Sabatini2011-08-301-0/+2
| | | | | | | | behavior
* | Use the shorter channel layout description for the common case.Carl Eugen Hoyos2011-08-281-4/+4
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-281-1/+1
|\ \ | |/ | | | | | | | | | | | | | | * qatar/master: Use deinterleavers for demangling audio packets in RealMedia. vf_scale: don't leak SWS context. doxygen: drop another pointless star from pointer variable name Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: drop another pointless star from pointer variable nameDiego Biurrun2011-08-271-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-264-14/+51
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fifo: add FIFO API test program, and fate test fifo: add av_fifo_peek2(), and deprecate av_fifo_peek() postprocess.c: filter name needs to be double 0 terminated doxygen: fix wrong comment syntax, //< vs. ///< doxygen: drop pointless star from pointer variable names Replace deprecated av_find_stream_info() by avformat_find_stream_info(). xmv: eliminate superfluous zeroing of zero data configure: fix typo in avconv dependency list Conflicts: configure doc/APIchanges libavutil/Makefile libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fifo: add FIFO API test program, and fate testStefano Sabatini2011-08-262-1/+37
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()Stefano Sabatini2011-08-262-4/+32
| | | | | | | | | | | | | | The new function provides a more generic interface than av_fifo_peek() for peeking at a FIFO buffer data. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * doxygen: drop pointless star from pointer variable namesDiego Biurrun2011-08-261-12/+12
| |
* | lavu: add av_get_media_type_string() convenience functionStefano Sabatini2011-08-202-1/+19
| | | | | | | | Avoid code duplication.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-181-0/+33
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) h264: hide reference frame errors unless requested swscale: split hScale() function pointer into h[cy]Scale(). Move clipd macros to x86util.asm. avconv: reindent. avconv: rescue poor abused start_time global. avconv: rescue poor abused recording_time global. avconv: merge two loops in output_packet(). avconv: fix broken indentation. avconv: get rid of the arbitrary MAX_FILES limit. avconv: get rid of the output_streams_for_file vs. ost_table schizophrenia avconv: add a wrapper for output AVFormatContexts and merge output_opts into it avconv: make itsscale syntax consistent with other options. avconv: factor out adding input streams. avconv: Factorize combining auto vsync with format. avconv: Factorize video resampling. avconv: Don't unnecessarily convert ipts to a double. ffmpeg: remove unsed variable nopts RV3/4 parser: remove unused variable 'off' add XMV demuxer rmdec: parse FPS in RealMedia properly ... Conflicts: avconv.c libavformat/version.h libswscale/swscale.c tests/ref/fate/lmlm4-demux Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move clipd macros to x86util.asm.Ronald S. Bultje2011-08-171-0/+33
| | | | | | | | This allows sharing them between multiple .asm files.
* | fifo: return AVERROR(ENOMEM) rather -1 in av_fifo_realloc2()Stefano Sabatini2011-08-141-1/+1
| |
* | fifo: apply misc cosmetic fixesStefano Sabatini2011-08-141-10/+11
| |
* | fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()Stefano Sabatini2011-08-142-5/+33
| | | | | | | | | | The new function provides a more flexible interface for peeking at a FIFO buffer data.
* | Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'Michael Niedermayer2011-08-132-0/+1447
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2c087871dafc7d030b2d48457ddff597dfd4925': Move x86util.asm from libavcodec/ to libavutil/. Move x86inc.asm to libavutil/. APIchanges: note error_recognition in lavf lavf: add support for error_recognition, use it in avidec, and bump minor API version avconv: change semantics of -map avconv: get rid of new* options. cmdutils: allow precisely specifying a stream for AVOptions. configure: add missing CFLAGS to fix building on the HURD libx264: Include hint for possible values for configuring libx264 cmdutils: allow ':'-separated modifiers in option names. avconv: make -map_metadata work consistently with the other options avconv: remove deprecated options. avconv: make -map_chapters accept only the input file index. Make a copy of ffmpeg under a new name -- avconv. ffmpeg: add a warning stating that the program is deprecated. Add weighted motion compensation for RV40 B-frames RV3/4: calculate B-frame motion weights once per frame Move RV3/4-specific DSP functions into their own context mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt h264: notice memory allocation failure Conflicts: .gitignore Makefile cmdutils.c configure doc/ffplay.texi doc/ffprobe.texi doc/ffserver.texi libavcodec/libx264.c libavformat/avformat.h libavformat/avidec.c libavformat/version.h tests/lavf-regression.sh tests/lavfi-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move x86util.asm from libavcodec/ to libavutil/.Ronald S. Bultje2011-08-121-0/+542
| | | | | | | | This allows using it in swscale also.
| * Move x86inc.asm to libavutil/.Ronald S. Bultje2011-08-121-0/+905
| | | | | | | | This allows using it in libswscale/ also.
* | av_get_string: search children too.Michael Niedermayer2011-08-131-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | av_get_number: also search children, this is more sane than not doing so.Michael Niedermayer2011-08-131-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | audioconvert: define unique strings for AV_CH_LAYOUT_5POINT{0,1}_BACKStefano Sabatini2011-07-282-3/+3
| | | | | | | | | | | | | | | | Previously the string for AV_CH_LAYOUT_5POINT{0,1}_BACK was the same of the string for AV_CH_LAYOUT_5POINT{0,1}. This is required for discerning the two channel layouts, given a channel layout string.
* | parseutils: add some documentation for small_strptime()Stefano Sabatini2011-07-231-1/+10
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-181-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * qatar/master: vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h dsputil: remove disabled code tta: remove disabled code gxfenc: place variable declarations before statements x86: Use LOCAL_ALIGNED in mpegvideo_mmx_template random_seed: use proper #includes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * random_seed: use proper #includesMans Rullgard2011-07-171-2/+2
| | | | | | | | | | | | Use <> for system headers, add needed math.h, drop unnecessary avutil.h. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-171-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffmpeg: fix some indentation ffmpeg: fix operation with --disable-avfilter simple_idct: remove disabled code motion_est: remove disabled code vc1: remove disabled code fate: separate lavf-mxf_d10 test from lavf-mxf cabac: Move code only used in the cabac test program to cabac.c. ffplay: warn that -pix_fmt is no longer working, suggest alternative ffplay: warn that -s is no longer working, suggest alternative lavf: rename enc variable in utils.c:has_codec_parameters() lavf: use designated initialisers for all (de)muxers. wav: remove a use of deprecated AV_METADATA_ macro rmdec: remove useless ap parameter from rm_read_header_old() dct-test: remove write-only variable des: fix #if conditional around P_shuffle Use LOCAL_ALIGNED in ff_check_alignment() Conflicts: ffmpeg.c libavformat/avidec.c libavformat/matroskaenc.c libavformat/mp3enc.c libavformat/oggenc.c libavformat/utils.c tests/ref/lavf/mxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * des: fix #if conditional around P_shuffleMans Rullgard2011-07-161-1/+1
| | | | | | | | | | | | CONFIG_SMALL is always defined as 0 or 1. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-152-6/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mem.h: switch doxygen parameter order to match function prototypeDiego Biurrun2011-07-151-2/+2
| |
| * doxygen: do not include license boilerplate in Doxygen documentationDiego Biurrun2011-07-151-4/+6
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-142-9/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * doxygen: Make sure parameter names match between .c and .h files.Diego Biurrun2011-07-142-9/+9
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-131-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * pix_fmt: Fix number of bits per component in yuv444p9beOskar Arvidsson2011-07-121-3/+3
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-121-5/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: changelog: misc typo and wording fixes H.264: add filter_mb_fast support for >8-bit decoding doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. lls: use av_lfg instead of rand() in test program build: remove unnecessary dependency on libs from 'all' target H.264: avoid redundant alpha/beta calculations in loopfilter H.264: optimize intra/inter loopfilter decision mpegts: fix Continuity Counter error detection build: remove unnecessary FFLDFLAGS variable vp8/mt: flush worker thread, not application thread context, on seek. mt: proper locking around release_buffer calls. DxVA2: unbreak build after [657ccb5ac75ce34e62bd67f228d9bd36db72189e] hwaccel: unbreak build Eliminate FF_COMMON_FRAME macro. Conflicts: Changelog Makefile doc/developer.texi libavcodec/avcodec.h libavcodec/h264.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lls: use av_lfg instead of rand() in test programMans Rullgard2011-07-111-5/+8
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-094-65/+115
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * AVOptions: in av_opt_find() don't return named constants unless unit is ↵Anton Khirnov2011-07-081-2/+3
| | | | | | | | | | | | | | | | | | specified. That is, unless the caller explicitly asks for them. Prevents conflict between e.g. the 'loop' option in img2 demuxer and 'loop' flag in AVCodecContext.
| * dict: extend documentation.Anton Khirnov2011-07-081-3/+36
| |
| * lls: whitespace cosmeticsMans Rullgard2011-07-081-59/+74
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
OpenPOWER on IntegriCloud