diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 22:37:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 22:37:41 +0200 |
| commit | d1f7b313ac3476e4b00f550e470f9f8429919299 (patch) | |
| tree | 3d24a2319f6ed857de556a84249ee6730cd18275 /libavformat/smjpeg.h | |
| parent | 01a6ae1396b5c96d23da40fe082d0f510fcab388 (diff) | |
| parent | f7e932473314e6ca4c851d49cbde8570b6e66383 (diff) | |
| download | ffmpeg-d1f7b313ac3476e4b00f550e470f9f8429919299.tar.gz | |
Merge commit 'f7e932473314e6ca4c851d49cbde8570b6e66383'
* commit 'f7e932473314e6ca4c851d49cbde8570b6e66383':
audiointerleave: Always initialize new_pkt
Conflicts:
libavformat/audiointerleave.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/smjpeg.h')
0 files changed, 0 insertions, 0 deletions