diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 22:36:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 22:37:18 +0200 |
| commit | 2284c38e4c682ac9f179d1c1489849e9b5fcc4b6 (patch) | |
| tree | 19161b4c6a472b9d332e79a3a517b50af7eadd7b /libavformat/aiffdec.c | |
| parent | 0318013afcffe0c3b8a0f0bf9f5f527098f6fa47 (diff) | |
| parent | e0010bb91fc0b067be8aefd2f77e6838537da433 (diff) | |
| download | ffmpeg-2284c38e4c682ac9f179d1c1489849e9b5fcc4b6.tar.gz | |
Merge commit 'e0010bb91fc0b067be8aefd2f77e6838537da433'
* commit 'e0010bb91fc0b067be8aefd2f77e6838537da433':
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 'libavformat/aiffdec.c')
0 files changed, 0 insertions, 0 deletions