diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 21:25:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 21:25:32 +0200 |
| commit | fd1e4d66f18372ad21de51bae223a2b699fed885 (patch) | |
| tree | f523dabd6c427ad5392ba30ec198b224cae03566 /libavformat/options_table.h | |
| parent | 87dc8b3af9135f0cfcdf3c0520e3f29e7b0d92c6 (diff) | |
| parent | 454697603e4efdfc04fadec40518d56c7dc1e5dd (diff) | |
| download | ffmpeg-fd1e4d66f18372ad21de51bae223a2b699fed885.tar.gz | |
Merge commit '454697603e4efdfc04fadec40518d56c7dc1e5dd'
* commit '454697603e4efdfc04fadec40518d56c7dc1e5dd':
mpegts: Use av_free() to free memory allocated by av_strdup()
Conflicts:
libavformat/mpegtsenc.c
See: 92deb28945a5f2b58908d383f183cfc1bc1d7fae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/options_table.h')
0 files changed, 0 insertions, 0 deletions