diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 21:34:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 21:34:31 +0200 |
| commit | afd62b3f184569492230e7f34ad55581c6b2d2c3 (patch) | |
| tree | 8735bd33eb54b8f60f9e6921ca9cce12fa015a90 /libavutil/avutil.h | |
| parent | f95298c913899207344d668a6d5624cb2d2e480c (diff) | |
| parent | fa14804c83a7108a50c63d1f2180e30c75909529 (diff) | |
| download | ffmpeg-afd62b3f184569492230e7f34ad55581c6b2d2c3.tar.gz | |
Merge commit 'fa14804c83a7108a50c63d1f2180e30c75909529'
* commit 'fa14804c83a7108a50c63d1f2180e30c75909529':
flv: Index the audio stream
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/avutil.h')
0 files changed, 0 insertions, 0 deletions