Merge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95'

* commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95':
  libavformat: Move avc mp4 startcode parsing to a shared file

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/avc.c
Simple merge

diff --cc libavformat/avc.h
Simple merge

diff --cc libavformat/rtpenc_h264.c
Simple merge