Merge commit '050324d020f843ce333276ebb6f27cc6026f37d0'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 18:55:42 +0000 (20:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 19:02:13 +0000 (21:02 +0200)
commit68f48406069e9aff0c01c96671f7c58de166e1f8
tree48d735453163e9ae36c707eae3a0d989b78844d5
parentcde98920da78801a40f9120cfef650ac05a22224
parent050324d020f843ce333276ebb6f27cc6026f37d0
Merge commit '050324d020f843ce333276ebb6f27cc6026f37d0'

* commit '050324d020f843ce333276ebb6f27cc6026f37d0':
  h264: initialize cur_chroma_format_idc

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