Merge commit '7c25ffe070c286874a8c3513f7504b90e1626b0c'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 19:19:23 +0000 (19:19 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 19:25:17 +0000 (19:25 +0000)
commit58dd885f9ae7feee002773253e345e11e7142739
treefbc4ca8c9d0367b61a7654b0f479bf528cb04058
parent8e2105297daecba193ce6f264becd2d5245f2d9d
parent7c25ffe070c286874a8c3513f7504b90e1626b0c
Merge commit '7c25ffe070c286874a8c3513f7504b90e1626b0c'

* commit '7c25ffe070c286874a8c3513f7504b90e1626b0c':
  mpeg1: Make intra-block decoding independent of MpegEncContext

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