1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
FFmpeg/libavutil
Michael Niedermayer 72153419b5 Merge remote branch 'qatar/master'
* qatar/master: (33 commits)
  rtpdec_qdm2: Don't try to parse data packet if no configuration is received
  ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand.
  ac3enc: clean up count_frame_bits() and count_frame_bits_fixed()
  mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame.
  srtdec: make sure we don't write past the end of buffer
  wmaenc: improve channel count and bitrate error handling in encode_init()
  matroskaenc: make sure we don't produce invalid file with no codec ID
  matroskadec: check that pointers were initialized before accessing them
  lavf: fix function name in compute_pkt_fields2 av_dlog message
  lavf: fix av_find_best_stream when providing a wanted stream.
  lavf: fix av_find_best_stream when decoder_ret is given and using a related stream.
  ffmpeg: factorize quality calculation
  tiff: add support for SamplesPerPixel tag in tiff_decode_tag()
  tiff: Prefer enum TiffCompr over int for TiffContext.compr.
  mov: Support edit list atom version 1.
  configure: Enable libpostproc automatically if GPL code is enabled.
  Cosmetics: fix prototypes in oggdec
  oggdec: fix memleak with continuous streams.
  matroskaenc: add missing new line in av_log() call
  dnxhdenc: add AVClass in private context.
  ...

swscale changes largely rewritten by me or replaced by baptsites due to lots of bugs in ronalds code.
Above code is also just in case its not obvios to a large extended duplicates that where cherry picked
from ffmpeg.

Conflicts:
	configure
	ffmpeg.c
	libavformat/matroskaenc.c
	libavutil/pixfmt.h
	libswscale/ppc/swscale_template.c
	libswscale/swscale.c
	libswscale/swscale_template.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	tests/fate/h264.mak
	tests/ref/lavfi/pixdesc_le
	tests/ref/lavfi/pixfmts_copy_le
	tests/ref/lavfi/pixfmts_null_le
	tests/ref/lavfi/pixfmts_scale_le
	tests/ref/lavfi/pixfmts_vflip_le

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-13 04:40:40 +02:00
..
arm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avr32 Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
bfin Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mips Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ppc Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
sh4 Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
tomi Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86 Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
adler32.c Replace many includes of libavutil/common.h with what is actually needed 2010-03-09 17:39:19 +00:00
adler32.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
aes.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
aes.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
attributes.h Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
audioconvert.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
audioconvert.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avassert.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avstring.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avstring.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avutil.h eval: add sqrt function for computing the square root 2011-05-05 18:38:35 +02:00
base64.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
base64.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
bswap.h bswap.h: Remove disabled code. 2011-04-29 20:01:04 +02:00
colorspace.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
common.h avutil: add divide & modulo that round like unsigned ones do that is down. 2011-05-09 17:47:22 +02:00
cpu.c Merge remote-tracking branch 'newdev/master' 2011-03-23 02:42:56 +01:00
cpu.h Merge remote-tracking branch 'newdev/master' 2011-03-23 02:42:56 +01:00
crc_data.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
crc.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
crc.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
des.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
des.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
error.c Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
error.h error: remove symbols which were deprecated before the big bump 2011-04-22 10:21:21 +02:00
eval.c eval: add sqrt function for computing the square root 2011-05-05 18:38:35 +02:00
eval.h lavu: remove FF_API_OLD_EVAL_NAMES cruft 2011-04-19 19:03:44 +02:00
fifo.c fifo: use av_freep() 2011-05-09 21:23:45 +02:00
fifo.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
file.c Use MAP_FAILED to check for mmap failure instead of manually 2011-05-07 10:34:55 +02:00
file.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
imgutils.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
imgutils.h Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
integer.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
integer.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
internal.h Merge remote branch 'qatar/master' 2011-05-09 04:50:56 +02:00
intfloat_readwrite.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
intfloat_readwrite.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
intmath.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
intreadwrite.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
inverse.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lfg.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lfg.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
libavutil.v Add symbol versioning for shared libraries 2010-01-16 04:49:02 +00:00
libm.h Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
lls.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lls.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
log.c Merge remote branch 'qatar/master' 2011-05-09 04:50:56 +02:00
log.h Check syntax even if DEBUG is not defined. 2011-05-11 12:26:25 +02:00
lzo.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lzo.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
Makefile Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
mathematics.c av_compare_ts: Improve speed when calculations fit in 64bit. 2011-05-11 20:41:19 +02:00
mathematics.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
md5.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
md5.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mem.c Fix posix_memalign() usage when libavutil is compiled outside FFmpeg. 2011-05-12 17:35:30 +02:00
mem.h Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' 2011-05-01 00:26:05 +02:00
opt.c AVOptions: make default_val a union, as proposed in AVOption2. 2011-05-10 20:22:06 +02:00
opt.h Merge remote branch 'qatar/master' 2011-05-11 05:47:02 +02:00
parseutils.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
parseutils.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
pca.c Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
pca.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
pixdesc.c swscale: extend YUV422p support to 10bits depth 2011-05-11 14:38:14 +02:00
pixdesc.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
pixfmt.h pixfmt-Comment: Fix big/little typo 2011-05-12 20:07:39 +02:00
random_seed.c Merge remote branch 'qatar/master' 2011-04-21 03:37:05 +02:00
random_seed.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rational.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rational.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rc4.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rc4.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
samplefmt.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
samplefmt.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
sha.c Merge remote branch 'qatar/master' 2011-04-21 03:37:05 +02:00
sha.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
softfloat.c Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
softfloat.h Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
timer.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
tree.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
tree.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
utils.c Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
x86_cpu.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00