Merge commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 24 Apr 2016 10:54:53 +0000 (11:54 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 24 Apr 2016 10:54:53 +0000 (11:54 +0100)
commit9809371aa5402d724cfaf74236bfe2ddb9829676
tree921c9142acc9c15aa61db94deff890c85904df52
parenta5a6621616aac55b8284002af4fef35b66e2b2d1
parenta7da517f6a5c472f46f67dd33bb6b95ccc919923
Merge commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923'

* commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923':
  h264data: Move all data tables from a header to a .c file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/Makefile
libavcodec/dxva2_h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_parser.c
libavcodec/h264_slice.c
libavcodec/h264data.c
libavcodec/h264data.h
libavcodec/svq3.c