diff options
| author | James Almer <jamrial@gmail.com> | 2016-08-01 12:58:09 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-08-01 12:58:09 -0300 |
| commit | 8c7932884d09bc580036640453fd6b7ad4dd77b4 (patch) | |
| tree | b88fefc3f633d5fc4f8064ff9aa438e03ce32b3b /libavcodec/h264_slice.c | |
| parent | 77b0f3f26d33d4f46f274896e0583ad1f5936b7c (diff) | |
| parent | f638b67e5790735f34620bf82025c9b9d6fc7216 (diff) | |
| download | ffmpeg-8c7932884d09bc580036640453fd6b7ad4dd77b4.tar.gz | |
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>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 5c505a138a..9495b6eb0e 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -40,6 +40,7 @@ #include "h264data.h" #include "h264chroma.h" #include "h264_mvpred.h" +#include "h264_ps.h" #include "golomb.h" #include "mathops.h" #include "mpegutils.h" |