Merge commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 21:28:40 +0000 (23:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 21:28:40 +0000 (23:28 +0200)
commitf2f99f07a5f1f74a91503cc6c3730c06498cee43
treef8a6fd207cf7c004e53d0f19ffa1ff0b7c25a5f1
parentd93cf093f840b9a28481c73d7e421f469f2ca4e7
parent5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f
Merge commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f'

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

Conflicts:
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h263dec.c
libavcodec/h264_slice.c
libavcodec/internal.h
libavcodec/mpeg12dec.c
libavcodec/utils.c
libavcodec/vc1dec.c