Merge commit '17a63ff0cd187b9e50e4a47862750295976853b1'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 03:55:41 +0000 (04:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 04:02:58 +0000 (05:02 +0100)
commit153b870d1e681f7bdbfcda7c8c4d6c2c347e5fd9
tree557c0885acd710f93443c9020cb4ec2ce0589dd7
parent983c7f4015baee2e5565c5702dd76dc4c8620aa7
parent17a63ff0cd187b9e50e4a47862750295976853b1
Merge commit '17a63ff0cd187b9e50e4a47862750295976853b1'

* commit '17a63ff0cd187b9e50e4a47862750295976853b1':
  h264: update flag name in ff_h264_decode_ref_pic_list_reordering()

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