Michael Niedermayer a4a2e894fc Merge commit '985f34b75653d02eda8eb8def3412f8577f19b01' ...

* commit '985f34b75653d02eda8eb8def3412f8577f19b01':
  utils: fix avcodec_flush_buffers pre-reference counting compatibility

Conflicts:
	libavcodec/utils.c

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

2013-06-17 00:21:22 +02:00

104 KiB

Raw Blame History

View Raw