Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 10:45:30 +0000 (12:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 10:46:10 +0000 (12:46 +0200)
commit77aafadc5655401e5806daed58300a2cccb19fb8
tree5784ddb1ecdc62045e2db225279365e19f4358a1
parentde417982e8977a1dbf05b48c9d0400c500bb5268
parentdb7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8
Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8'

* commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8':
  h264: Move start code search functions into separate source files.

Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/h264dsp_init_arm.c
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/startcode.c
libavcodec/startcode.h

See: 270cede3f3772117454a14b620803d731036942d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/Makefile
libavcodec/arm/Makefile
libavcodec/arm/h264dsp_init_arm.c
libavcodec/arm/startcode.h
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/h264dsp.h
libavcodec/startcode.c
libavcodec/startcode.h