Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Mar 2013 11:10:52 +0000 (12:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Mar 2013 11:10:52 +0000 (12:10 +0100)
commit547042a8cd0f425263a4f96603debe8b4fab1b93
tree07ccaad536ba426f0c28ebf5de954ceecb64f433
parent2d2e6db7cfe5d50fb428a03f7c6450e7248d0a36
parent437211ae73ef1ed8285b4fed7620502ea4999e11
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: set ref_count to 0 for intra slices.

Conflicts:
libavcodec/h264.c

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