Merge commit '249827f736db4c94dfcb24a3883aa4c04f9b119b'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 19:05:26 +0000 (19:05 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 19:05:26 +0000 (19:05 +0000)
commit8e2105297daecba193ce6f264becd2d5245f2d9d
treefe0563a07abadfb4768e89c2d984f2dab3d68cf3
parent2ec66ff83d00c3dbef06616e86994bb33d319202
parent249827f736db4c94dfcb24a3883aa4c04f9b119b
Merge commit '249827f736db4c94dfcb24a3883aa4c04f9b119b'

* commit '249827f736db4c94dfcb24a3883aa4c04f9b119b':
  mpeg12dec: Refactor mpeg1_decode_block_intra()

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