Merge commit '570a4a0189946c2c983da41d37fdd67fa13266e7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jan 2013 12:38:20 +0000 (13:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jan 2013 12:38:20 +0000 (13:38 +0100)
commitb4a7f4d018aaeb29d18d5982e7234e472b58bac6
tree4bd0ffbc2080ad8e9596ef37723b58aa29ed2acf
parent0a84174f2d41757bcefdc87e9dfb26a7016ab62f
parent570a4a0189946c2c983da41d37fdd67fa13266e7
Merge commit '570a4a0189946c2c983da41d37fdd67fa13266e7'

* commit '570a4a0189946c2c983da41d37fdd67fa13266e7':
  avidec: use sensible error codes instead of -1

Conflicts:
libavformat/avidec.c

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