Merge commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 16:07:59 +0000 (18:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 16:08:30 +0000 (18:08 +0200)
commit508a5349da9869382803445f8e380751ec43021e
tree326265c58daa160743bcbbbc0c2d95ff393539ac
parent7565aaecb4978cb5903335ffdea5dae21a924494
parent3dd5c95deef51d7fbf6f4458ba42d1335d2f1472
Merge commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472'

* commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472':
  riff: Move muxing code to a separate file

Conflicts:
configure
libavformat/riff.c

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