diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 22:11:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 22:11:37 +0200 |
| commit | efcf1fcad32568d5784640c687b067dd205b1cba (patch) | |
| tree | af149bc2f717663fbcc6423db0fa505e55ec8dc7 /libavformat/asfcrypt.c | |
| parent | 3224a319c0b8b1bfcf842f599630cb9516a503a3 (diff) | |
| parent | 5b220e1e19c17b202d83d9be0868d152109ae8f0 (diff) | |
| download | ffmpeg-efcf1fcad32568d5784640c687b067dd205b1cba.tar.gz | |
Merge commit '5b220e1e19c17b202d83d9be0868d152109ae8f0'
* commit '5b220e1e19c17b202d83d9be0868d152109ae8f0':
mpegts: Fix memory leaks and related crashes in mpegs_write_header()
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asfcrypt.c')
0 files changed, 0 insertions, 0 deletions