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)
* commit '443b71928b2f36362e805c037751e6c3c79ea4e8':
  hevc: unref the current frame if frame_start() fails

Conflicts:
libavcodec/hevc.c

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

Simple merge