Merge commit '443b71928b2f36362e805c037751e6c3c79ea4e8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 12:15:06 +0000 (13:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 12:15:06 +0000 (13:15 +0100)
commita7fa1b9aa104491e44a0489e09febe036c70f4f9
tree7b3bd98612d4deb3678fef9c58aca7e02bcd34ad
parent74e5a5a849bc57df564eca4cf60e1da4148c2e83
parent443b71928b2f36362e805c037751e6c3c79ea4e8
Merge commit '443b71928b2f36362e805c037751e6c3c79ea4e8'

* commit '443b71928b2f36362e805c037751e6c3c79ea4e8':
  hevc: unref the current frame if frame_start() fails

Conflicts:
libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc.c