OSDN Git Service

Merge commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Mar 2013 11:05:13 +0000 (12:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Mar 2013 11:05:13 +0000 (12:05 +0100)
commitbbc0f6f9789361f9ddd462bc458410e6f0081d57
treeb26ceba305959785c11ef932c183a9639f31d91d
parent6c8ac2d78230990f3a01be28d3ef68fb281d6609
parent25408b2a0660c1e6c8555559c4ed71dff2ede31e
Merge commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e'

* commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e':
  h264: make ff_h264_frame_start static.

Conflicts:
libavcodec/h264.c
libavcodec/h264.h

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