1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
FFmpeg/libavcodec/alpha
Michael Niedermayer eadba3e94d Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f'
* commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f':
  adxdec: use planar sample format
  adpcmdec: use planar sample format for adpcm_thp
  adpcmdec: use planar sample format for adpcm_ea_xas
  adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3
  adpcmdec: use planar sample format for adpcm_xa
  adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3
  adpcmdec: use planar sample format for adpcm_4xm
  adpcmdec: use planar sample format for adpcm_ima_wav
  adpcmdec: use planar sample format for adpcm_ima_qt
  pcmdec: use planar sample format for pcm_lxf
  mace: use planar sample format
  atrac1: use planar sample format
  build: non-x86: Only compile mpegvideo optimizations when necessary
  rtpdec_mpeg4: au_headers is a single array, simple av_free is enough
  avcodec: free extended_data instead address of it
  fate: Add tests of the ff_make_absolute_url function
  url: Handle relative urls starting with two slashes
  url: Handle relative urls being just a new query string
  url: Don't treat slashes in query parameters as directory separators

Conflicts:
	libavcodec/adxdec.c
	libavcodec/mips/Makefile
	libavcodec/pcm.c
	libavcodec/utils.c
	libavformat/Makefile
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-10 13:01:27 +02:00
..
asm.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dsputil_alpha_asm.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dsputil_alpha.c dsputil/me/pixels: Actually use av_restrict 2012-09-09 03:55:56 +02:00
dsputil_alpha.h dsputil/me/pixels: Actually use av_restrict 2012-09-09 03:55:56 +02:00
Makefile build: non-x86: Only compile mpegvideo optimizations when necessary 2012-10-09 14:45:59 +02:00
motion_est_alpha.c dsputil/me/pixels: Actually use av_restrict 2012-09-09 03:55:56 +02:00
motion_est_mvi_asm.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mpegvideo_alpha.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
regdef.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
simple_idct_alpha.c Merge remote branch 'qatar/master' 2011-05-02 03:45:58 +02:00