Merge commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Jul 2013 08:57:51 +0000 (10:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Jul 2013 08:57:51 +0000 (10:57 +0200)
commit5dc2c99055ae4a95336f28c58c8c8da4033979f1
tree2e0633e3a1113c1d80de5659efca98a05ab8ca14
parentbbc7d33a0d7dad79f3d514349b0ba321121b80fe
parent93a51984a27f3ba84d4e6f13d0c704ee9891603e
Merge commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e'

* commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e':
  mpeg12: Ignore slice threading if hwaccel is active

Conflicts:
libavcodec/mpeg12dec.c

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