Merge commit '985f34b75653d02eda8eb8def3412f8577f19b01'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 22:21:22 +0000 (00:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 22:21:22 +0000 (00:21 +0200)
commita4a2e894fca19e284c28a4114d7718bf5588dfa1
tree25d5681f8615a5349d2fc4b77e7f98e78f46d9ad
parent1f87cbe8349d8662c0d6ead40cc39620b01ae0da
parent985f34b75653d02eda8eb8def3412f8577f19b01
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>
libavcodec/utils.c