Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Apr 2014 18:47:13 +0000 (20:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Apr 2014 18:47:13 +0000 (20:47 +0200)
commit56efd98a6574641a32f08cd5123725cef28a309b
tree27a85d0dc0eb40d0ad99e96bb7684514be3da44f
parentecb815e5117f3353ed3e67bb737029773d170212
parente2834567d73bd1e46478ba67ac133cb8ef5f50fd
Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'

* commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd':
  On2 AVC decoder

Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/on2avc.c
libavcodec/on2avcdata.c
libavcodec/on2avcdata.h
libavcodec/version.h
libavformat/riff.c