summaryrefslogtreecommitdiff
path: root/libavcodec/h264_ps.h
Commit message (Collapse)AuthorAge
* Merge commit 'a8cbe5a0ccebf60a8a8b0aba5d5716dd54c1595c'Hendrik Leppkes2016-11-17
|\ | | | | | | | | | | | | * commit 'a8cbe5a0ccebf60a8a8b0aba5d5716dd54c1595c': h264_ps: export actual height in MBs as SPS.mb_height Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * h264_ps: export actual height in MBs as SPS.mb_heightAnton Khirnov2016-07-11
| | | | | | | | | | | | | | | | | | | | | | | | Currently, SPS.mb_height is actually what the spec calls PicHeightInMapUnits, which is half the frame height when interlacing is allowed. Calling this 'mb_height' is quite confusing, and there are at least two associated bugs where this field is treated as the actual frame height - in the h264 parser and in the code computing maximum reordering buffer size for a given level. Fix those issues (and avoid possible future ones) by exporting the real frame height in this field.
* | avcodec/h264dec: move ff_h264_ps_uninit prototype to h264_ps.hJames Almer2016-08-03
| | | | | | | | | | | | It's the proper place since 8c7932884d09bc580036640453fd6b7ad4dd77b4 Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit 'f638b67e5790735f34620bf82025c9b9d6fc7216'James Almer2016-08-01
|/ | | | | | | | | | | | * 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>
* h264: move the parameter set definitions to a new header fileAnton Khirnov2016-06-21
The PS parsing code is independent from the decoder, so it makes more sense for it to have its own separate header.