Merge commit '35ba079fbf281a066f3ac1e1271f3caa402dcd74' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 23:47:30 +0000 (01:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 23:47:33 +0000 (01:47 +0200)
commit8d32735629321873ed2d4993b1b0a2a037aca29e
tree13d2378440abe69d2fc9891cb27df6a39a9ba49c
parent0558832796b0be1fb8817ba8b7cbfa9d5cf765ee
parent35ba079fbf281a066f3ac1e1271f3caa402dcd74
Merge commit '35ba079fbf281a066f3ac1e1271f3caa402dcd74' into release/0.10

* commit '35ba079fbf281a066f3ac1e1271f3caa402dcd74':
  h264: reset ref count if decoding the slice header fails

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