Merge commit '7769be590c7aeb2aad26ca723d105cf5203e33d2'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Feb 2015 19:29:34 +0000 (20:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Feb 2015 19:29:34 +0000 (20:29 +0100)
commit4177f501b433a59edcdb8368f02082514f55f580
tree424acd87ff514a083ea37653e0467b01e03af57b
parent3eec775b211c5fd00300e2042ae8f116293e5d55
parent7769be590c7aeb2aad26ca723d105cf5203e33d2
Merge commit '7769be590c7aeb2aad26ca723d105cf5203e33d2'

* commit '7769be590c7aeb2aad26ca723d105cf5203e33d2':
  vp56: Return meaningful error codes

Conflicts:
libavcodec/vp56.c

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