diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 00:16:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 00:27:10 +0100 |
| commit | 3a15168a6e9764f51d41d1e95ca1fc7386ade5ad (patch) | |
| tree | c133045ca240b79c0033ac156e0839aaf59fb064 /libavformat/mpegtsenc.c | |
| parent | edbbb11488e1fce9b9703535936d2e1731e2e318 (diff) | |
| parent | 4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f (diff) | |
| download | ffmpeg-3a15168a6e9764f51d41d1e95ca1fc7386ade5ad.tar.gz | |
Merge commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f'
* commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f':
libavformat: Allow calling av_write_trailer with a NULL AVIOContext
Conflicts:
libavformat/mux.c
See: 277f20c3c877a74aca9d480480024a6d66c9fbc4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegtsenc.c')
0 files changed, 0 insertions, 0 deletions