[FFmpeg-cvslog] Merge commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 11 23:28:40 2014 +0200| [f2f99f07a5f1f74a91503cc6c3730c06498cee43] | committer: Michael Niedermayer

Merge commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f'

* commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f':
  lavc: set AVCodecContext.hwaccel in ff_get_format()

Conflicts:
	libavcodec/mpeg12dec.c

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

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