Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 16:30:26 +0000 (18:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 16:30:47 +0000 (18:30 +0200)
commit0a8f5eb23a2d95f2bab6a0e7e19cc838d99fcdf1
tree5602f50fe193e3307a6ae8320fc478533ebe3a06
parent508a5349da9869382803445f8e380751ec43021e
parent255d9c570e117f0fcb8e51fa2c5996f3c4b2052b
Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b'

* commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b':
  riff: Move demuxing code to a separate file.

Conflicts:
configure
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavformat/Makefile
libavformat/riff.c
libavformat/riffdec.c