summaryrefslogtreecommitdiff
path: root/libavcodec/h264_parser.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2016-08-01 13:02:20 -0300
committerJames Almer <jamrial@gmail.com>2016-08-01 13:02:20 -0300
commit9ee1f033656374a9f7c9bddcfd85739614580d62 (patch)
treeae6b3c2ac05ade8deebde1b8f9173baea5a97507 /libavcodec/h264_parser.c
parent8c7932884d09bc580036640453fd6b7ad4dd77b4 (diff)
parent70b1dcef2d859ae6b3e21d61de928c3dd0cf1aa4 (diff)
Merge commit '70b1dcef2d859ae6b3e21d61de928c3dd0cf1aa4'
* commit '70b1dcef2d859ae6b3e21d61de928c3dd0cf1aa4': h264: tighten the valid range for ref_frame_count Conflicts: libavcodec/h264_ps.c Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/h264_parser.c')
0 files changed, 0 insertions, 0 deletions