-
Michael Niedermayer authored
* commit '5d21ca45': h264_mp4toannexb_bsf: K&R formatting cosmetics Conflicts: libavcodec/h264_mp4toannexb_bsf.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
46a5003a
* commit '5d21ca45': h264_mp4toannexb_bsf: K&R formatting cosmetics Conflicts: libavcodec/h264_mp4toannexb_bsf.c Merged-by:Michael Niedermayer <michaelni@gmx.at>