Merge commit 'f638b67e5790735f34620bf82025c9b9d6fc7216'
authorJames Almer <jamrial@gmail.com>
Mon, 1 Aug 2016 15:58:09 +0000 (12:58 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 1 Aug 2016 15:58:09 +0000 (12:58 -0300)
commit8c7932884d09bc580036640453fd6b7ad4dd77b4
treeb88fefc3f633d5fc4f8064ff9aa438e03ce32b3b
parent77b0f3f26d33d4f46f274896e0583ad1f5936b7c
parentf638b67e5790735f34620bf82025c9b9d6fc7216
Merge commit 'f638b67e5790735f34620bf82025c9b9d6fc7216'

* commit 'f638b67e5790735f34620bf82025c9b9d6fc7216':
  h264: move the parameter set definitions to a new header file

Conflicts:
libavcodec/h264_parse.h
libavcodec/h264_ps.c
libavcodec/h264dec.h

Merged-by: James Almer <jamrial@gmail.com>
15 files changed:
libavcodec/dxva2_h264.c
libavcodec/h264.h
libavcodec/h264_direct.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb.c
libavcodec/h264_parse.c
libavcodec/h264_parse.h
libavcodec/h264_parser.c
libavcodec/h264_ps.c
libavcodec/h264_ps.h
libavcodec/h264_slice.c
libavcodec/h264dec.c
libavcodec/h264dec.h
libavcodec/vaapi_h264.c
libavcodec/vdpau_h264.c