Michael Niedermayer 301522f521 Merge commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3' ...

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

Conflicts:
	libavcodec/bitstream.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-06-16 23:29:37 +02:00

13 KiB

Raw Blame History

View Raw