diff options
author | Martin Storsjö <martin@martin.st> | 2013-03-25 12:42:57 +0200 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2013-03-26 09:48:12 +0200 |
commit | 75644335b907919057960716508477239c26fed4 (patch) | |
tree | c5caa37705a00b1ecd01ac603d04e349844b58af /libavcodec/mpegvideo.c | |
parent | 613a37eca4c7b8eefceaa3e0231c23ad090ca94f (diff) | |
download | ffmpeg-75644335b907919057960716508477239c26fed4.tar.gz |
lavc: Move start code finding to utils.c
This allows dropping the mpegvideo dependency from a number of
components.
This also fixes standalone building of the h264 parser, which
was broken in 64e438697.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index dab1485fcc..5635c26c83 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -158,39 +158,6 @@ static void mpeg_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type, ff_MPV_decode_mb(s, s->block); } -const uint8_t *avpriv_mpv_find_start_code(const uint8_t *restrict p, - const uint8_t *end, - uint32_t * restrict state) -{ - int i; - - assert(p <= end); - if (p >= end) - return end; - - for (i = 0; i < 3; i++) { - uint32_t tmp = *state << 8; - *state = tmp + *(p++); - if (tmp == 0x100 || p == end) - return p; - } - - while (p < end) { - if (p[-1] > 1 ) p += 3; - else if (p[-2] ) p += 2; - else if (p[-3]|(p[-1]-1)) p++; - else { - p++; - break; - } - } - - p = FFMIN(p, end) - 4; - *state = AV_RB32(p); - - return p + 4; -} - /* init common dct for both encoder and decoder */ av_cold int ff_dct_common_init(MpegEncContext *s) { |