Merge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Sep 2014 22:02:52 +0000 (00:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Sep 2014 22:09:42 +0000 (00:09 +0200)
commitb8d3f7fc21b987378bb6042e038d7f598374dba8
treec6df276c639d6484d75b3bc24ff27a6c5101401f
parentad26e83f9cb8626346164ca5e794e940e63db32c
parenta2efbecc4ed12d287cf29856418c4da4a7648d95
Merge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avc.c
libavformat/avc.h
libavformat/rtpenc_h264.c