diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 14:44:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 14:44:22 +0100 |
| commit | 82e6660ae2372cdf96acb3bfebdd82b82f51d23f (patch) | |
| tree | a3b0a2fa89a4a4e936bdd5926e2781db7c33e297 /COPYING.LGPLv2.1 | |
| parent | c08e523586b6be36bee3f73d609733cd80a57674 (diff) | |
| parent | 59444c76e6d43529a12dbd80b6dd29c6ba4079a9 (diff) | |
| download | ffmpeg-82e6660ae2372cdf96acb3bfebdd82b82f51d23f.tar.gz | |
Merge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9'
* commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9':
avconv: add stream-global side data to the first demuxed packet
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.LGPLv2.1')
0 files changed, 0 insertions, 0 deletions