Merge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 21:58:59 +0000 (23:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 21:58:59 +0000 (23:58 +0200)
commit8097307bfb6a90d18d35a870ff61016111820ab7
tree1ebbdf511c4541ab5a55cff43cbb3ddd4a6b04f2
parentbbdef61850205f5af1a0a292fb7166c92726e93b
parent12db891dcd57b305d6e3c1e22ea8204dc26edda1
Merge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1'

* commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1':
  avf: move ff_write_chained to mux.c

Conflicts:
libavformat/mux.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mux.c
libavformat/utils.c