Merge commit '668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Mar 2013 10:53:19 +0000 (11:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Mar 2013 10:53:19 +0000 (11:53 +0100)
commit2d2e6db7cfe5d50fb428a03f7c6450e7248d0a36
tree56bf6e124c332247552732968a9c4606e13dbdd7
parentec203cd69b57e298e6735e041fb5a2a0c880b44c
parent668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8
Merge commit '668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8'

* commit '668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8':
  h264: on reference overflow, reset the reference count to 0, not 1.

Conflicts:
libavcodec/h264.c

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