Merge commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 20:40:43 +0000 (22:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 20:40:43 +0000 (22:40 +0200)
commit46a5003a4a69b0e8cd824fd058618011d44bf8ef
tree42e81eacaf93e3db9f3622e0b5abe0ad89701607
parente997afdfc61e7c48ae7daea9b45dc6305e85aca0
parent5d21ca45591bb1c1d2265f8ed972d18c563f145e
Merge commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e'

* commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e':
  h264_mp4toannexb_bsf: K&R formatting cosmetics

Conflicts:
libavcodec/h264_mp4toannexb_bsf.c

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