1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavutil
Michael Niedermayer 29582df797 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  vble: remove vble_error_close
  VBLE Decoder
  tta: use an integer instead of a pointer to iterate output samples
  shorten: do not modify samples pointer when interleaving
  mpc7: only support stereo input.
  dpcm: do not try to decode empty packets
  dpcm: remove unneeded buf_size==0 check.
  twinvq: add SSE/AVX optimized sum/difference stereo interleaving
  vqf/twinvq: pass vqf COMM chunk info in extradata
  vqf: do not set bits_per_coded_sample for TwinVQ.
  twinvq: check for allocation failure in init_mdct_win()
  swscale: add padding to conversion buffer.
  rtpdec: Simplify finalize_packet
  http: Handle proxy authentication
  http: Print an error message for Authorization Required, too
  AVOptions: don't return an invalid option when option list is empty
  AIFF: add 'twos' FourCC for the mux/demuxer (big endian PCM audio)

Conflicts:
	libavcodec/avcodec.h
	libavcodec/tta.c
	libavcodec/vble.c
	libavcodec/version.h
	libavutil/opt.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 02:50:25 +01:00
..
arm arm: fix av_clipl_int32() asm 2011-10-11 20:25:55 +02: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 mpegaudiodec: add SSE-optimized imdct36() 2011-11-07 22:35:55 +01:00
adler32.c adler32: whitespace cosmetics 2011-06-30 16:50:27 +01:00
adler32.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
aes.c Merge remote-tracking branch 'qatar/master' 2011-11-11 02:50:35 +01:00
aes.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
attributes.h avutil: add av_noreturn 2011-11-11 04:24:00 +01:00
audioconvert.c audioconvert: make av_get_channel_layout accept composite names. 2011-11-09 21:03:47 +01:00
audioconvert.h audioconvert: make av_get_channel_layout accept composite names. 2011-11-09 21:03:47 +01:00
avassert.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
avstring.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
avstring.h Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
avutil.h audioconvert: make av_get_channel_layout accept composite names. 2011-11-09 21:03:47 +01: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 Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
cpu.c Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
cpu.h Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
crc_data.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
crc.c Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
crc.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
des.c Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
des.h Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
dict.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
dict.h Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
error.c error.c: fix compile flags 2011-05-30 03:11:54 +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 mathematical constants (PI, E, PHI). 2011-10-13 16:50:20 +02:00
eval.h lavu: remove FF_API_OLD_EVAL_NAMES cruft 2011-04-19 19:03:44 +02:00
fifo.c Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
fifo.h fifo: add note in av_fifo_realloc2() doxy regarding reallocation failure behavior 2011-08-30 10:03:13 +02:00
file.c av_tempfile: dont try the current directory with mkstemp() unless we are on windows 2011-10-16 22:32:41 +02:00
file.h av_tempfile: Pass int log_offset, void *log_ctx 2011-10-16 21:51:28 +02:00
imgutils.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
imgutils.h Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
integer.c avutil: Remove unused arbitrary precision integer code. 2011-06-28 13:14:46 +02:00
integer.h avutil: Remove unused arbitrary precision integer code. 2011-06-28 13:14:46 +02:00
internal.h avutil: Don't allow using strcasecmp/strncasecmp 2011-11-06 11:52:59 +02:00
intfloat_readwrite.c Merge remote-tracking branch 'qatar/master' 2011-10-12 05:40:57 +02: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 Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
inverse.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
lfg.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lfg.h Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
libavutil.v Add symbol versioning for shared libraries 2010-01-16 04:49:02 +00:00
libm.h Check for cbrtf() and provide fallback 2011-10-22 19:49:27 +02:00
lls.c Merge remote-tracking branch 'qatar/master' 2011-07-12 01:42:32 +02:00
lls.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
log.c Merge remote-tracking branch 'qatar/master' 2011-11-03 02:16:26 +01:00
log.h Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
lzo.c av_lzo1x_decode: properly handle negative buffer length. 2011-11-05 23:25:20 +01:00
lzo.h Merge remote-tracking branch 'qatar/master' 2011-07-03 03:14:10 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
mathematics.c Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
mathematics.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
md5.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
md5.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mem.c mem: fix memalign hack av_realloc() 2011-10-11 22:03:19 +02:00
mem.h Introduce av_realloc_f. 2011-09-28 18:13:52 +02:00
opt.c Merge remote-tracking branch 'qatar/master' 2011-11-12 02:50:25 +01:00
opt.h opt: remove attribute_deprecated from several functions that do not have adequante replacements. 2011-11-02 18:53:57 +01:00
parseutils.c Replace all usage of strcasecmp/strncasecmp 2011-11-06 11:52:57 +02:00
parseutils.h Merge remote-tracking branch 'qatar/master' 2011-07-14 20:44:58 +02:00
pca.c Remove unused, never built libavutil/pca.[ch] 2011-06-29 23:49:03 +01:00
pca.h Remove unused, never built libavutil/pca.[ch] 2011-06-29 23:49:03 +01:00
pixdesc.c HWAccel: adds Video Decoder Acceleration (VDA) module for Mac OS X. 2011-11-02 15:47:27 +01:00
pixdesc.h pixdesc: remove duplicated header inclusion 2011-06-06 11:34:45 +02:00
pixfmt.h HWAccel: adds Video Decoder Acceleration (VDA) module for Mac OS X. 2011-11-02 15:47:27 +01:00
random_seed.c Merge remote-tracking branch 'qatar/master' 2011-07-18 16:43:46 +02:00
random_seed.h avutil: elaborate documentation for av_get_random_seed 2011-06-30 21:19:16 +02:00
rational.c Merge remote-tracking branch 'qatar/master' 2011-06-30 04:32:24 +02: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 Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
samplefmt.c Put strings inside struct instead of extra indirection. 2011-11-05 11:30:46 +01:00
samplefmt.h Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
sha.c Merge remote-tracking branch 'qatar/master' 2011-07-05 02:26:17 +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 Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02: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 lavu: add av_get_media_type_string() convenience function 2011-08-20 14:20:25 +02:00
x86_cpu.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00