[FFmpeg-cvslog] Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 18:30:26 2013 +0200| [0a8f5eb23a2d95f2bab6a0e7e19cc838d99fcdf1] | committer: Michael Niedermayer

Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b'

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

Conflicts:
	configure
	libavformat/riff.c

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

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