diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-05 15:41:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-05 15:48:23 +0200 |
| commit | 008d36ba1de3aa0e55b0e6c8298b11be6c6bef1f (patch) | |
| tree | 48cea561321bc48a1ce87f5861fa68483d32eaf3 /libavformat/smjpeg.c | |
| parent | 1bd22229d7bf582d2749d4f96e1e2fca7f1dc044 (diff) | |
| parent | eb447d515956b3ce182d9750083131735f00324c (diff) | |
| download | ffmpeg-008d36ba1de3aa0e55b0e6c8298b11be6c6bef1f.tar.gz | |
Merge commit 'eb447d515956b3ce182d9750083131735f00324c'
* commit 'eb447d515956b3ce182d9750083131735f00324c':
segment: Free and reinit the muxer before calling avformat_write_header
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/smjpeg.c')
0 files changed, 0 insertions, 0 deletions