Merge commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Apr 2016 15:34:40 +0000 (16:34 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Apr 2016 15:34:40 +0000 (16:34 +0100)
commita2922b5d614ca6db025364f47bc4a1e4812859aa
treece37baec9ca2a82cd1a91c83ad4959fbfc76c421
parentc18535399d2597afd8855ccaa4416b0999d0d7f9
parentecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad
Merge commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad'

* commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad':
  h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/Makefile
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_parse.c
libavcodec/h264_parse.h
libavcodec/svq3.c