Merge commit '00fd914d4912322212e924c15f325cebf2fde8d3'
authorJames Almer <jamrial@gmail.com>
Fri, 10 Nov 2017 23:31:55 +0000 (20:31 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 10 Nov 2017 23:31:55 +0000 (20:31 -0300)
commit7762942045a05170de8bbe9d707c2344b445907f
tree13106a295e78206d3d2caf1573a9dc2c7c1c0b1e
parent09100ccc14690a9d781f055642b5b880752ee636
parent00fd914d4912322212e924c15f325cebf2fde8d3
Merge commit '00fd914d4912322212e924c15f325cebf2fde8d3'

* commit '00fd914d4912322212e924c15f325cebf2fde8d3':
  hevcdec: set the active SPS before calling get_format()

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/hevcdec.c