[FFmpeg-cvslog] Merge commit 'c91c63b5380bf79655c09320774a022f84d76fd5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  2 11:27:58 2013 +0100| [973dc110ba0ace5ecc57a01b3f6a44d58cd8079c] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=973dc110ba0ace5ecc57a01b3f6a44d58cd8079c
---