Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 03:31:42 +0000 (04:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 03:32:05 +0000 (04:32 +0100)
commit16ddc58bd7a2f98b47fb2597a2b349d0aba82da4
tree46f0b63bd1c9d5bd3970920226c12accc45845fb
parent03e4c2d8333d46c598856f218d9dfeb9316266d8
parent70daeacd6ef8b354dd7d2d77ad393831a5bbf033
Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033'

* commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033':
  PAF demuxer and decoder

Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/paf.c
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/paf.c
libavformat/version.h

See: 7de4a16508cb9bd2d40855f7114dea14329ef62a, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/general.texi
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/paf.c
libavcodec/utils.c
libavcodec/version.h
libavformat/paf.c
libavformat/version.h