summaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* Revert "lavc: remove a half-working attempt at different defaults for ↵Michael Niedermayer2011-07-111-1/+1
| | | | | | audio/video codecs." This reverts commit 18c007ba37b2c7dee5bd2f1a3eb3bfee9b6b3d26.
* Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'Michael Niedermayer2011-07-1118-62/+178
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '142e76f1055de5dde44696e71a5f63f2cb11dedf': swscale: fix crash with dithering due incorrect offset calculation. matroskadec: fix stupid typo (!= -> ==) build: remove duplicates from order-only directory prerequisite list build: rework rules for things in the tools dir configure: fix --cpu=host with gcc 4.6 ARM: use const macro to define constant data in asm bitdepth: simplify FUNC/FUNCC macros dsputil: remove ff_emulated_edge_mc macro used in one place 9/10-bit: simplify clipping macros matroskadec: reindent matroskadec: defer parsing of cues element until we seek. lavc: add support for codec-specific defaults. lavc: make avcodec_alloc_context3 officially public. lavc: remove a half-working attempt at different defaults for audio/video codecs. ac3dec: add a drc_scale private option lavf: add avformat_find_stream_info() lavc: introduce avcodec_open2() as a replacement for avcodec_open(). Conflicts: Makefile libavcodec/utils.c libavformat/avformat.h libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ARM: use const macro to define constant data in asmMans Rullgard2011-07-106-25/+20
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * bitdepth: simplify FUNC/FUNCC macrosMans Rullgard2011-07-101-10/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dsputil: remove ff_emulated_edge_mc macro used in one placeMans Rullgard2011-07-102-3/+1
| | | | | | | | | | | | | | | | | | | | This macro can cause problems in conjunction with the bitdepth template expansion. It was presumably added to keep source compatibility when high bitdepth support was added. However, emulated_edge_mc is a dsputil pointer and should not be called directly, so there is little reason to keep such a macro. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * 9/10-bit: simplify clipping macrosMans Rullgard2011-07-101-15/+6
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavc: add support for codec-specific defaults.Anton Khirnov2011-07-103-0/+23
| |
| * lavc: make avcodec_alloc_context3 officially public.Anton Khirnov2011-07-106-11/+35
| | | | | | | | Deprecate avcodec_alloc_context/2.
| * lavc: remove a half-working attempt at different defaults for audio/video ↵Anton Khirnov2011-07-101-1/+1
| | | | | | | | | | | | codecs. It should be replaced with proper per-codec defaults.
| * ac3dec: add a drc_scale private optionAnton Khirnov2011-07-105-1/+28
| | | | | | | | | | | | Deprecate corresponding AVCodecContext option. This is the first test of decoder private options.
| * lavc: introduce avcodec_open2() as a replacement for avcodec_open().Anton Khirnov2011-07-104-2/+66
| | | | | | | | | | Adds support for decoder-private options and makes setting other options simpler.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-1011-81/+1138
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) H.264: fix filter_mb_fast with 4:4:4 + 8x8dct alsa: limit buffer_size to 32768 frames. alsa: fallback to buffer_size/4 for period_size. doc: replace @pxref by @ref where appropriate mpeg1video: don't abort if thread_count is too high. segafilm: add support for videos with cri adx adpcm gxf: Fix 25 fps DV material in GXF being misdetected as 50 fps libxvid: Add const qualifier to silence compiler warning. H.264: improve qp_thresh check H.264: use fill_rectangle in CABAC decoding H.264: Remove redundant hl_motion_16/8 code H.264: merge fill_rectangle into P-SKIP MV prediction, to match B-SKIP H.264: faster P-SKIP decoding H.264: av_always_inline some more functions H.264: Add x86 assembly for 10-bit H.264 predict functions swscale: rename uv_off/uv_off2 to uv_off_px/byte. swscale: implement error dithering in planarCopyWrapper. swscale: error dithering for 16/9/10-bit to 8-bit. swscale: fix overflow in 16-bit vertical scaling. swscale: fix crash in 8-bpc bilinear output without alpha. ... Conflicts: doc/developer.texi libavdevice/alsa-audio.h libavformat/gxf.c libswscale/swscale.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/x86/swscale_template.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_crop tests/ref/lavfi/pixfmts_hflip tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * H.264: fix filter_mb_fast with 4:4:4 + 8x8dctJason Garrett-Glaser2011-07-091-1/+1
| |
| * mpeg1video: don't abort if thread_count is too high.Frank Barchard2011-07-091-5/+9
| | | | | | | | | | | | Instead, just decrease it to a valid value and use that. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * libxvid: Add const qualifier to silence compiler warning.Diego Biurrun2011-07-091-1/+1
| | | | | | | | libavcodec/libxvidff.c:752: warning: initialization discards qualifiers from pointer target type
| * H.264: improve qp_thresh checkJason Garrett-Glaser2011-07-082-6/+4
| | | | | | | | Eliminate redundant check in filter_mb_fast, consider bit depth in calculating qp_thresh.
| * H.264: use fill_rectangle in CABAC decodingJason Garrett-Glaser2011-07-081-2/+1
| |
| * H.264: Remove redundant hl_motion_16/8 codeJason Garrett-Glaser2011-07-081-42/+10
| |
| * H.264: merge fill_rectangle into P-SKIP MV prediction, to match B-SKIPJason Garrett-Glaser2011-07-082-25/+24
| |
| * H.264: faster P-SKIP decodingJason Garrett-Glaser2011-07-082-10/+102
| | | | | | | | | | Inline the relevant parts of fill_decode_caches into P-SKIP mv prediction to avoid calling the whole thing.
| * H.264: av_always_inline some more functionsJason Garrett-Glaser2011-07-083-8/+8
| | | | | | | | These weren't getting inlined all the time in all gcc versions.
| * H.264: Add x86 assembly for 10-bit H.264 predict functionsDaniel Kang2011-07-084-1/+998
| | | | | | | | | | | | | | | | Mainly ported from 8-bit H.264 predict. Some code ported from x264. LGPL ok by author. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | cosmetic: reindent of dxva2 zigzag workaroundJoakim Plate2011-07-091-7/+7
| |
* | Added ability to enable workaround for dxva2 decoding using older ATI cardsJoakim Plate2011-07-092-2/+17
| | | | | | | | | | | | The workaround need to be enabled per pci id which can not be detected inside ffmpeg. So this adds a flag that enabled the alternate behavior.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-094-58/+590
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mp3enc: write a xing frame containing number of frames in the fileAnton Khirnov2011-07-081-0/+1
| |
| * dnxhd: prettify tablesMans Rullgard2011-07-081-36/+574
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * flashsv: inline copy_region() into flashsv_decode_frame()Diego Biurrun2011-07-081-16/+11
| |
| * flashsv: improve some variable namesDiego Biurrun2011-07-071-7/+7
| |
| * libschroedingerdec: Remove write-only variable.Diego Biurrun2011-07-071-2/+0
| | | | | | | | libavcodec/libschroedingerdec.c:211:23: warning: variable 'format' set but not used
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-082-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: clean up library installation rules vf_drawtext: Remove some write-only variables. libgsm: Drop const qualifier to silence compiler warning. docs: Remove needless configure options docs: Don't recommend adding --enable-memalign-hack libvo-amrwbenc: Add braces to shut up gcc warning. adts: Fix PCE copying. Conflicts: configure doc/general.texi subdir.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libgsm: Drop const qualifier to silence compiler warning.Diego Biurrun2011-07-071-1/+1
| | | | | | | | | | libavcodec/libgsm.c:148: warning: passing argument 2 of ‘gsm_decode’ discards qualifiers from pointer target type /usr/include/gsm/gsm.h:68: note: expected ‘gsm_byte *’ but argument is of type ‘const uint8_t *’
| * libvo-amrwbenc: Add braces to shut up gcc warning.Diego Biurrun2011-07-071-1/+1
| | | | | | | | libavcodec/libvo-amrwbenc.c:37:5: warning: missing braces around initializer
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-063-65/+52
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * bink: pass Bink version to audio decoder through extradata instead of codec_tag.Kostya2011-07-061-1/+1
| | | | | | | | | | | | | | This is needed because not all players (e.g. MPlayer) are able to distinguish two different Bink audio decoders when codec_tag is set. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * flashsv: improve some comments and fix some wrong onesDiego Biurrun2011-07-061-6/+6
| |
| * flashsv: Eliminate redundant variable indirection.Diego Biurrun2011-07-061-3/+2
| | | | | | | | | | As a positive side-effect, this gets rid of the following warning: libavcodec/flashsv.c:190:38: warning: assignment discards ‘const’ qualifier from pointer target type
| * flashsv: set reference frame type to full frameDiego Biurrun2011-07-061-1/+1
| |
| * flashsv: replace bitstream description by a link to the specificationDiego Biurrun2011-07-061-19/+3
| | | | | | | | | | | | An official specification now exists and it is both more detailed and easier to understand than the incomplete notes available here. Also remove ideas on how to implement an encoder; these notes are already present in the encoder.
| * flashsv: convert a debug av_log into av_dlogDiego Biurrun2011-07-061-4/+3
| |
| * flashsv: simplify conditionDiego Biurrun2011-07-061-3/+2
| |
| * flashsv: return more meaningful error valuesDiego Biurrun2011-07-061-2/+2
| |
| * flashsv: cosmetics: break some overly long linesDiego Biurrun2011-07-061-8/+15
| |
| * flashsv: cosmetics: drop some unnecessary parenthesesDiego Biurrun2011-07-061-11/+11
| |
| * H.264: make loopfilter bS const where applicableJason Garrett-Glaser2011-07-051-9/+9
| |
* | Support fourcc YV24.ami_stuff2011-07-062-0/+2
| | | | | | | | Fixes ticket #306.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-068-8/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Add some missing mathematics.h #includes for av_rescale(). opencore-amr: Add missing initializer braces to shut up gcc warning. ARM: workaround for bug in GNU assembler dv: fix comment wording mistake Rename libavcodec/high_bit_depth.h ---> libavcodec/bit_depth_template.c dv: fix valgrind use of uninitialised value warnings. mxfenc: fix ignored drop flag in binary timecode representation. PPC: use Altivec IMDCT only for supported sizes dv: fix comment spelling configure: simplify -rpath-link linker flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * opencore-amr: Add missing initializer braces to shut up gcc warning.Diego Biurrun2011-07-051-1/+1
| | | | | | | | | | This fixes the warning: libavcodec/libopencore-amr.c:91: warning: missing braces around initializer
| * ARM: workaround for bug in GNU assemblerMans Rullgard2011-07-051-1/+1
| | | | | | | | | | | | | | | | Some versions of the GNU assembler do not handle 64-bit immediate operands containing arithmetic. Writing the value out in full works correctly. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dv: fix comment wording mistakeClément Bœsch2011-07-051-2/+2
| |
OpenPOWER on IntegriCloud