Merge commit 'd8c772de53d29afb1bada88afa859fce8489c668'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Jan 2013 14:23:20 +0000 (15:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Jan 2013 14:23:20 +0000 (15:23 +0100)
commitcfc40a6aff8d35627469ef960531264c2f66a74e
tree8b153d939fe63d808438c444b464be66c81c4ae2
parent24d06cb2089fbe74912e82d613b8c166be1386a8
parentd8c772de53d29afb1bada88afa859fce8489c668
Merge commit 'd8c772de53d29afb1bada88afa859fce8489c668'

* commit 'd8c772de53d29afb1bada88afa859fce8489c668':
  nutdec: Always return a value from nut_read_timestamp()
  configure: Make warnings from -Wreturn-type fatal errors
  x86: ABS2: port to cpuflags
  vdpau: Remove av_unused attribute from function declaration
  h264: fix ff_generate_sliding_window_mmcos() prototype.

Conflicts:
configure
libavformat/nutdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_refs.c
libavcodec/vdpau_internal.h
libavcodec/x86/ac3dsp.asm
libavcodec/x86/dsputilenc.asm
libavutil/x86/x86util.asm