Michael Niedermayer 00ebf89dcd Merge commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91' ...

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

Conflicts:
	libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2015-06-12 22:55:49 +02:00

4.3 KiB

Raw Blame History

View Raw