Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Feb 2014 20:05:31 +0000 (21:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Feb 2014 20:05:31 +0000 (21:05 +0100)
commitf3a862935d68f6b8f0b9432c39c5bb42fcf175d0
treec9020555b0e9fab3f4aa077c4c0105f7358fa874
parent91126dc481a48400dd00cc45e98fb25520344874
parentdc971acf4aa31fb5ffb37aad01e6f1fd8e90a0fa
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264_parser: use enum values in h264_find_frame_end()

Conflicts:
libavcodec/h264_parser.c

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