ffmpeg/libavcodec/ps2
Michael Niedermayer 4095fa9038 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  dnxhddec: optimise dnxhd_decode_dct_block()
  rtp: remove disabled code
  eac3enc: use different numbers of blocks per frame to allow higher bitrates
  dnxhd: add regression test for 10-bit
  dnxhd: 10-bit support
  dsputil: update per-arch init funcs for non-h264 high bit depth
  dsputil: template get_pixels() for different bit depths
  dsputil: create 16/32-bit dctcoef versions of some functions
  jfdctint: add 10-bit version
  mov: add clcp type track as Subtitle stream.
  mpeg4: add Mpeg4 Profiles names.
  mpeg4: decode Level Profile for MPEG4 Part 2.
  ffprobe: display bitstream level.
  imgconvert: remove unused glue and xglue macros

Conflicts:
	libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-22 12:08:52 +02:00
..
dsputil_mmi.c Merge remote-tracking branch 'qatar/master' 2011-07-22 12:08:52 +02:00
idct_mmi.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mmi.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mpegvideo_mmi.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00