Age | Commit message (Collapse) | Author |
|
* 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>
|
|
|
|
* 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>
|
|
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
* qatar/master: (21 commits)
swscale: Add Doxygen for hyscale_fast/hScale.
fate: enable lavfi-pixmt tests on big endian systems
PPC: swscale: disable altivec functions for unsupported formats
fate: merge identical pixdesc_be/le tests
swscale: Add Doxygen for yuv2planar*/yuv2packed* functions.
build: call texi2pod.pl with full path instead of symlink
build: include sub-makefiles using full path instead of symlinks
swscale: update big endian reference values after dff5a835.
wavpack: skip blocks with no samples
cosmetics: remove outdated comment that is no longer true
build: replace some addprefix/addsuffix with substitution refs
avutil: Remove unused arbitrary precision integer code.
configure: Drop check for availability of ten assembler operands.
aacenc: Save channel configuration for later use.
aacenc: Fix codebook trellising for zeroed bands.
swscale: change prototypes of scaled YUV output functions.
swscale: re-add support for non-native endianness.
swscale: disentangle yuv2rgbX_c_full() into small functions.
swscale: split yuv2packed[12X]_c() remainders into small functions.
swscale: split yuv2packedX_altivec in smaller functions.
...
Conflicts:
Makefile
configure
libavcodec/x86/dsputil_mmx.c
libavfilter/Makefile
libavformat/Makefile
libavutil/integer.c
libavutil/integer.h
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/x86/swscale_template.c
tests/ref/lavfi/pixdesc_le
tests/ref/lavfi/pixfmts_scale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
Makefiles."
This reverts commit a6213f3dce4006e0d47bd938e15832987d95efef.
|
|
* qatar/master:
ARM: silence some annoying armcc warnings
ffplay: Remove unused-but-set channels variable from update_sample_display().
build: Add DEP_LIBS dependency directly to the shared library build rule.
build: Remove multiple inclusion guards from config.mak.
build: Remove redundant config.mak includes from subdirectory Makefiles.
aacenc: Mark psy_3gpp_window() as av_unused.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Calling Make from subdirectories is not supported and config.mak has
multiple inclusion guards anyway, so the top-level include is enough.
|
|
replace check for p==NULL with *p==0)
|
|
|
|
code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* qatar/master:
log: Fix an oob array read.
cosmetics: trim trailing whitespace in postproc
Ban strncpy() it's too easy to misuse.
psymodel: Remove wrapper functions.
aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'.
regtest: remove redundant flags in jpg test
regtest: use run_ffmpeg in do_image_formats
regtest: simplify encoding functions
ffmpeg.c: check for interlaced flag in the correct place.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
* qatar/master: (23 commits)
doc: Check standalone compilation before submitting new components.
Fix standalone compilation of pipe protocol.
Fix standalone compilation of ac3_fixed encoder.
Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders.
Fix standalone compilation of IMC decoder.
Fix standalone compilation of WTV demuxer.
Fix standalone compilation of MXPEG decoder.
flashsv: K&R cosmetics
matroskaenc: fix memory leak
vc1: make overlap filter for I-frames bit-exact.
vc1dec: use s->start/end_mb_y instead of passing them as function args.
Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."
Replace strncpy() with av_strlcpy().
indeo3: Eliminate use of long.
get_bits: make cache unsigned to eliminate undefined signed overflow.
asfdec: fix assert failure on invalid files
avfilter: check malloc return values.
Not pulled as reason for reindent is not pulled: mpegvideo: reindent.
nutenc: check malloc return values.
Not pulled due to much simpler solution in ffmpeg *: don't av_malloc(0).
...
Conflicts:
doc/developer.texi
libavcodec/Makefile
libavcodec/get_bits.h
libavcodec/mpegvideo.c
libavformat/Makefile
libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
|
|
They've accumulated enough new APIs and corresponding deprecated cruft.
This breaks API and ABI.
|
|
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Not Pulled:
commit 42cfb3835b5dad327b7dc22740e8b6e482ecfcd2
Author: Mans Rullgard <mans@mansr.com>
Date: Mon Feb 28 18:06:58 2011 +0000
Remove Sonic experimental audio codec
commit 2912e87a6c9264d556734e2bf94a99c64cf9b102
Author: Mans Rullgard <mans@mansr.com>
Date: Fri Mar 18 17:35:10 2011 +0000
Replace FFmpeg with Libav in licence headers
|
|
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
|
|
This reverts commit 29ba091136a5e04574f7bfc1b17536c923958f6f.
|
|
This reverts commit a03be6e1ba4cbf9984b0bbdb674704bbb2da6713.
|
|
|
|
also update the multiple inclusion guards in config.h|mak
|
|
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
|
|
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
|
|
used to initialized another array element of the same array.
Originally committed as revision 24479 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.
Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Patch by Yuriy Kaminskiy, yumkam mail ru
Originally committed as revision 21607 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Based on patch by Reinhard Tartler <siretart tauware de>
Originally committed as revision 21236 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
XXX_license() functions, consistent with the rest of FFmpeg.
Originally committed as revision 21005 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 20547 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 19668 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18898 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18380 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
some 'may be used uninitialized' warnings.
Originally committed as revision 17963 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
We do this for all other libraries already.
Originally committed as revision 16990 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.
Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16787 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16780 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16592 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16238 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
version #ifdef since otherwise public API is broken.
Originally committed as revision 16064 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16062 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Gets rid of the following warning:
postprocess_template.c:3271: warning: ‘postProcess_C’ defined but not used
Originally committed as revision 16055 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
x86 assembler code files, just libpostprocess was forgotten.
Originally committed as revision 15767 to svn://svn.ffmpeg.org/ffmpeg/trunk
|