* commit '985f34b75653d02eda8eb8def3412f8577f19b01': utils: fix avcodec_flush_buffers pre-reference counting compatibility Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>