Merge commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Dec 2012 12:41:06 +0000 (13:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Dec 2012 12:41:06 +0000 (13:41 +0100)
commitf186ecc164e8dad145d4637ac1d55b66e460af7a
treeb14e6d2d85dd3589c4a4cc5bb5c730976d9df854
parent75b7e543df05e9d4dfb1f73a28bceecd0bd1971b
parentbb675d3ac6d722d5e117ae9042a996b55ca05b1d
Merge commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d'

* commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d':
  vp56: make parse_header return standard error codes

Conflicts:
libavcodec/vp56.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vp5.c
libavcodec/vp56.c
libavcodec/vp56.h
libavcodec/vp6.c