Merge commit '75644335b907919057960716508477239c26fed4'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Mar 2013 12:22:48 +0000 (13:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Mar 2013 12:22:48 +0000 (13:22 +0100)
commit2cdedcbceab952297d5ee0f433b5a5c7482e48d6
treed4e6a15939fa7655758c99ca15e369cd9d9c666a
parent795b911bd8acaec4b6f7dc1590f63a529c028ac8
parent75644335b907919057960716508477239c26fed4
Merge commit '75644335b907919057960716508477239c26fed4'

* commit '75644335b907919057960716508477239c26fed4':
  lavc: Move start code finding to utils.c

Conflicts:
configure
libavcodec/mpegvideo.c
libavcodec/utils.c

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