Merge commit 'ecab21ac47d0d4ca604bebf494017ae5090853a8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 14:15:03 +0000 (15:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 14:15:18 +0000 (15:15 +0100)
commitad3412d0283bc7db538ee5d28c01223eb327a80d
treef15930979e13591f8848fb3808a53b0acd373422
parent6e57d2da9058fcb0eefedf5102321a044d51e6dc
parentecab21ac47d0d4ca604bebf494017ae5090853a8
Merge commit 'ecab21ac47d0d4ca604bebf494017ae5090853a8'

* commit 'ecab21ac47d0d4ca604bebf494017ae5090853a8':
  h264: do not reset the ref lists in flush_change()

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