Merge commit '0749314886390f6ec81d45e0ba424fcb36c945cf'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 10:54:46 +0000 (11:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 10:54:46 +0000 (11:54 +0100)
commitd57a6fe6abdab934063b809e43096bf887d01696
tree96870fe8697376c54185274de467cbd0fc5f1af3
parentc985966a10599219bf52d21aebdf203d669c8c60
parent0749314886390f6ec81d45e0ba424fcb36c945cf
Merge commit '0749314886390f6ec81d45e0ba424fcb36c945cf'

* commit '0749314886390f6ec81d45e0ba424fcb36c945cf':
  h263: Return meaningful errors

Conflicts:
libavcodec/h263dec.c

See: 7b62d3415e8e44618cb97775567d453295c4f4d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h263dec.c