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)
* commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95':
  libavformat: Move avc mp4 startcode parsing to a shared file

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

Simple merge
Simple merge
Simple merge