Merge commit 'a097f0049b28dc3ed13625e4a42619292c92492f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:27:53 +0000 (01:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:33:17 +0000 (01:33 +0100)
commitdb7580b4f6b2217917aa6f372e3a18dfca43624a
tree5643ab3c87daf3cd59e2a873ecc08c2f950d6626
parent85d3bc33b1c19726a481143b2515fa86383e0a72
parenta097f0049b28dc3ed13625e4a42619292c92492f
Merge commit 'a097f0049b28dc3ed13625e4a42619292c92492f'

* commit 'a097f0049b28dc3ed13625e4a42619292c92492f':
  mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context

Conflicts:
libavcodec/mpeg12dec.c

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