[FFmpeg-cvslog] Merge commit 'd8c772de53d29afb1bada88afa859fce8489c668'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 15 15:23:20 2013 +0100| [cfc40a6aff8d35627469ef960531264c2f66a74e] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cfc40a6aff8d35627469ef960531264c2f66a74e
---