Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Mar 2012 21:10:30 +0000 (23:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Mar 2012 21:10:30 +0000 (23:10 +0200)
commit9621646eb316d7595f0f8198efd39f36efa30440
tree8cc20303687a958f7a1530e14c65e9eadd54be8f
parent8d7f2db60a9cc2b6fd87a410a69f4deafa3edff9
parent62ce9defb81d0b6bd179131d1502858c8778f411
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: prettyprint gcc inline asm
  x86: K&R prettyprinting cosmetics for dsputil_mmx.c
  x86: conditionally compile H.264 QPEL optimizations
  dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.
  Ignore generated files below doc/.
  dpcm: convert to bytestream2.
  interplayvideo: convert to bytestream2.
  movenc: Merge if statements
  h264: fix memleak in error path.
  pthread: Immediately release all frames in ff_thread_flush()
  h264: Add check for invalid chroma_format_idc
  utvideo: port header reading to bytestream2.

Conflicts:
.gitignore
configure
libavcodec/h264_ps.c
libavcodec/interplayvideo.c
libavcodec/pthread.c
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
.gitignore
configure
libavcodec/dpcm.c
libavcodec/h264_ps.c
libavcodec/interplayvideo.c
libavcodec/pthread.c
libavcodec/utvideo.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c
libavformat/movenc.c