Merge commit '772d150a6e82542c06b0c251e73dd299d98d1027'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Jun 2014 23:45:59 +0000 (01:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Jun 2014 23:46:30 +0000 (01:46 +0200)
commit82e4340f1ef0dba67ca9e264a400aec895293dfe
tree1553dcbd7fb5cd4c4cc7e0ab6d9c49f446e7fa75
parent97511bc7cf443ffd6b8738f8f290422a0e3b23e5
parent772d150a6e82542c06b0c251e73dd299d98d1027
Merge commit '772d150a6e82542c06b0c251e73dd299d98d1027'

* commit '772d150a6e82542c06b0c251e73dd299d98d1027':
  h264: error out from decode_nal_units() when AV_EF_EXPLODE is set

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