Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Aug 2012 20:17:02 +0000 (22:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Aug 2012 20:17:02 +0000 (22:17 +0200)
commitb4780d03d04d402b490be21b01ec886565cabe29
tree2c5605baa7b588cced8f79c2916eb724356d5c25
parent69aeba1396d5a13e79cbc3cc9f49fd6896addb82
parent2096857551660649dbe9a5aad7338b0872858575
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2
  rational: add av_inv_q() returning the inverse of an AVRational
  dpx: Make start offset unsigned
  lavfi: properly signal out-of-memory error in ff_filter_samples
  cosmetics: Fix a few switched periods and linebreaks
  zerocodec: Fix memleak in decode_frame
  zerocodec: Cosmetics

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
libavcodec/dpx.c
libavcodec/x86/h264_idct.asm
libavfilter/audio.c
libavutil/rational.h