diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 22:55:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 22:55:49 +0200 |
| commit | 00ebf89dcdeb0587eba80ebd634591873f64624a (patch) | |
| tree | 554be177c46913dcd627624b57d2e87bc5abad6c /libavfilter | |
| parent | e1ec9c7fb6ba57f0ce5e6f51703b09b9d550406c (diff) | |
| parent | a7ac1a7b94447f33ae95be4d6d186e2775977f91 (diff) | |
| download | ffmpeg-00ebf89dcdeb0587eba80ebd634591873f64624a.tar.gz | |
Merge commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91'
* commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91':
flv: Name an enum and use its type
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions