From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 24 Sep 2014 22:02:52 +0000 (+0200)
Subject: Merge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95'
X-Git-Tag: n2.6-dev~1353
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/b8d3f7fc21b987378bb6042e038d7f598374dba8

Merge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95'

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

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

b8d3f7fc21b987378bb6042e038d7f598374dba8