Merge commit 'e481458bc308ee838deaeacac51929514762e7a7'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 26 Apr 2016 14:04:29 +0000 (15:04 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 26 Apr 2016 14:04:29 +0000 (15:04 +0100)
commitee38234c43b6b3280304be7a43dc569cef683c43
treed8988b87ec816f608ac38eb18a2d236220a3ac8a
parent79aafd43fd255fc04e4f4db4c45d6d1f5a9b9fff
parente481458bc308ee838deaeacac51929514762e7a7
Merge commit 'e481458bc308ee838deaeacac51929514762e7a7'

* commit 'e481458bc308ee838deaeacac51929514762e7a7':
  h264: factor out pred weight table parsing into a separate file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
12 files changed:
libavcodec/Makefile
libavcodec/dxva2_h264.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_mb.c
libavcodec/h264_mc_template.c
libavcodec/h264_parse.c
libavcodec/h264_parse.h
libavcodec/h264_parser.c
libavcodec/h264_refs.c
libavcodec/h264_slice.c
libavcodec/vaapi_h264.c