Merge commit '1b20d0f581f01f2df601c9e68d0d321672d97af7'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Oct 2013 00:10:43 +0000 (02:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Oct 2013 00:10:43 +0000 (02:10 +0200)
commitd794b7db1453ada81c49ae03e777250b5c2868c6
tree67ed04875db0777ef699f5a289a7266160e1b4e5
parentfb8a10db5d77424774493376b5d0412808bb0491
parent1b20d0f581f01f2df601c9e68d0d321672d97af7
Merge commit '1b20d0f581f01f2df601c9e68d0d321672d97af7'

* commit '1b20d0f581f01f2df601c9e68d0d321672d97af7':
  cavs: Return meaningful error values

Conflicts:
libavcodec/cavsdec.c

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