]> git.sesse.net Git - ffmpeg/commit
Merge commit '43dd004747fa697396b47d034a80e069facbea09'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 21:36:37 +0000 (23:36 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 21:37:19 +0000 (23:37 +0200)
commitf01e3c5d000d264b2935e186594a37a3c00f9465
treee5d126e20c4eae7084ec809aa320a173683ee250
parente3ec2cde2c394af6c9b64bccd39bc206a88a4e58
parent43dd004747fa697396b47d034a80e069facbea09
Merge commit '43dd004747fa697396b47d034a80e069facbea09'

* commit '43dd004747fa697396b47d034a80e069facbea09':
  hap: Move some per-stream setup into decoder init rather than per-frame

Conflicts:
libavcodec/hapdec.c

See: 6074956fa1d2617ac602e49931b06df0a751370e
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/hapdec.c