Merge commit '3f111804eb5c603a344706b84b7164cbf7b4e0df'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Jan 2013 13:57:57 +0000 (14:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Jan 2013 13:57:57 +0000 (14:57 +0100)
commit353dbaa29714c9fb7d4b3ccc7e1b50569b0ea257
treee0e67a898b5e6ce2ba9d641473960beb109995ff
parent8686b6c68bacfdd9ffa89736756192188973ad5d
parent3f111804eb5c603a344706b84b7164cbf7b4e0df
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@gmx.at>
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c
libavformat/matroska.c
libavformat/nut.c
libavformat/rtpdec.h