diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-05 15:12:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-05 15:12:54 +0200 |
| commit | 1bd22229d7bf582d2749d4f96e1e2fca7f1dc044 (patch) | |
| tree | 5cb5cdb6a00296bbe871ecc4e2e073a368d167eb /libavformat/bink.c | |
| parent | d19728da6f0048d4f6208a34c849aee61c8e2b2a (diff) | |
| parent | 73871dc96ff78053b9dcd0eb259b7f5a5308ec87 (diff) | |
| download | ffmpeg-1bd22229d7bf582d2749d4f96e1e2fca7f1dc044.tar.gz | |
Merge commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87'
* commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87':
segment: Use the public av_write_header/av_write_trailer functions
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/bink.c')
0 files changed, 0 insertions, 0 deletions