Michael Niedermayer 8097307bfb 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>

2013-06-16 23:58:59 +02:00

28 KiB

Raw Blame History

View Raw