Michael Niedermayer
|
dd78e1090b
|
Merge commit '1e46c63eb7'
* commit '1e46c63eb7':
avformat: refactor avformat_write_header
Conflicts:
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2012-10-02 18:48:56 +02:00 |
|
Michael Niedermayer
|
6cbbf4a274
|
Merge commit '86bbdf865e'
* commit '86bbdf865e':
avformat: refactor avformat_write_header
Conflicts:
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2012-10-02 18:36:09 +02:00 |
|
Michael Niedermayer
|
513042c926
|
Merge commit '55f9037f38'
* commit '55f9037f38':
avformat: split muxing functions from util.c
Conflicts:
libavformat/internal.h
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2012-10-02 18:20:24 +02:00 |
|
Luca Barbato
|
1e46c63eb7
|
avformat: refactor avformat_write_header
Split away option settings, sanity checks and general setup.
|
2012-10-01 19:57:57 +02:00 |
|
Luca Barbato
|
86bbdf865e
|
avformat: refactor avformat_write_header
Mostly cosmetic changes adding some intermediate to shorten the lines.
|
2012-10-01 19:57:57 +02:00 |
|
Luca Barbato
|
55f9037f38
|
avformat: split muxing functions from util.c
|
2012-10-01 19:57:57 +02:00 |
|