[FFmpeg-cvslog] Merge commit 'a097f0049b28dc3ed13625e4a42619292c92492f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 01:27:53 2013 +0100| [db7580b4f6b2217917aa6f372e3a18dfca43624a] | committer: Michael Niedermayer

Merge commit 'a097f0049b28dc3ed13625e4a42619292c92492f'

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

Conflicts:
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db7580b4f6b2217917aa6f372e3a18dfca43624a
---