[FFmpeg-cvslog] Merge commit '3f111804eb5c603a344706b84b7164cbf7b4e0df'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 15 14:57:57 2013 +0100| [353dbaa29714c9fb7d4b3ccc7e1b50569b0ea257] | committer: Michael Niedermayer

Merge commit '3f111804eb5c603a344706b84b7164cbf7b4e0df'

* commit '3f111804eb5c603a344706b84b7164cbf7b4e0df':
  libvpx: make vp8 and vp9 selectable
  libvpx: support vp9
  nut: support vp9 tag
  mkv: support vp9 tag
  rtpdec: Make variables that should wrap unsigned

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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