diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-04 14:18:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-04 14:18:32 +0200 |
| commit | b8e44118b13614f74c13a5540fdac4a5f097b70d (patch) | |
| tree | 588768a3ec7ea322661602dbb393d8f88114d905 /libavformat/mux.c | |
| parent | 205b6021358efa06c66e835dd4b265cf7cbc4047 (diff) | |
| parent | 24fee95321c1463360ba7042d026dae021854360 (diff) | |
| download | ffmpeg-b8e44118b13614f74c13a5540fdac4a5f097b70d.tar.gz | |
Merge commit '24fee95321c1463360ba7042d026dae021854360'
* commit '24fee95321c1463360ba7042d026dae021854360':
rtmpproto: Move the flv header/trailer addition to append_flv_data
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mux.c')
0 files changed, 0 insertions, 0 deletions