Merge commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 21:29:37 +0000 (23:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 21:29:37 +0000 (23:29 +0200)
commit301522f521f05c998fb8dfba153d49e557604507
tree89342e95cce1caf0f73de912a0529decd406e7da
parent9265bae3567c85b55fc4cdfad141bb34a939d6fd
parentf80b60ad59945dae32bb26a4e239ed94b0e92fa3
Merge commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3'

* commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3':
  bitstream: forward error values and drop few abort()

Conflicts:
libavcodec/bitstream.c

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