diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 21:07:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 21:07:42 +0200 |
| commit | 8624b49276558d451cf3c494d30975f31e926afb (patch) | |
| tree | d2db12d6ecc18ba565ad7d151010f190d8279c6c /libpostproc/postprocess.c | |
| parent | 39cb08cdc20af8662b0f3cac749c7f707ec7448f (diff) | |
| parent | 386e80610de282c92ad5897683ccaf2675766ac5 (diff) | |
| download | ffmpeg-8624b49276558d451cf3c494d30975f31e926afb.tar.gz | |
Merge commit '386e80610de282c92ad5897683ccaf2675766ac5' into release/2.4
* commit '386e80610de282c92ad5897683ccaf2675766ac5':
mux: Do not leave stale side data pointers in ff_interleave_add_packet()
Conflicts:
libavformat/mux.c
See: bfb3ed1a9d5dafdc185080fdd88d02ff7221d30a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc/postprocess.c')
0 files changed, 0 insertions, 0 deletions