Merge commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Oct 2012 16:15:13 +0000 (18:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Oct 2012 16:20:24 +0000 (18:20 +0200)
commit513042c92669dbfcd604a9dcdb96176e05ecba90
tree076d1be0435de00d262aa2c202fbb3ee3fb3268e
parentf5b31daa5e27c009bae78c0ae6a366aaa9dfc9fe
parent55f9037f38bc3beacb2f5a17408c1d24c077d7fd
Merge commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd'

* commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd':
  avformat: split muxing functions from util.c

Conflicts:
libavformat/internal.h
libavformat/utils.c

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