Merge commit 'c91c63b5380bf79655c09320774a022f84d76fd5'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Mar 2013 10:27:58 +0000 (11:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Mar 2013 10:27:58 +0000 (11:27 +0100)
commit973dc110ba0ace5ecc57a01b3f6a44d58cd8079c
tree78f3d550ebf1438cef260a321f5d9fb35576a46b
parent3827734591d8e4a9948f3e57c53e59a549193b9e
parentc91c63b5380bf79655c09320774a022f84d76fd5
Merge commit 'c91c63b5380bf79655c09320774a022f84d76fd5'

* commit 'c91c63b5380bf79655c09320774a022f84d76fd5':
  flvdec: Don't read the VP6 header byte when setting codec type based on metadata

Conflicts:
libavformat/flvdec.c

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