Merge commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 20:55:49 +0000 (22:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 20:55:49 +0000 (22:55 +0200)
commit00ebf89dcdeb0587eba80ebd634591873f64624a
tree554be177c46913dcd627624b57d2e87bc5abad6c
parente1ec9c7fb6ba57f0ce5e6f51703b09b9d550406c
parenta7ac1a7b94447f33ae95be4d6d186e2775977f91
Merge commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91'

* commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91':
  flv: Name an enum and use its type

Conflicts:
libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/flv.h
libavformat/flvdec.c