Merge commit 'e9f884416c76558098fc1f63825b293956e8483c'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 17 May 2016 13:38:08 +0000 (14:38 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 17 May 2016 13:38:14 +0000 (14:38 +0100)
commit7ab2c036b917ad3ecaf245601aeba4316b6604c2
treebf9f13cd33e67286a6bc9654a494d5af8ee1a14c
parent15ad0232107496c3b12d8aaedfc3398b8cda9ee7
parente9f884416c76558098fc1f63825b293956e8483c
Merge commit 'e9f884416c76558098fc1f63825b293956e8483c'

* commit 'e9f884416c76558098fc1f63825b293956e8483c':
  h264: move reading direct_spatial_mv_pred out of ff_set_ref_count()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/h264.c
libavcodec/h264_parser.c
libavcodec/h264_slice.c