aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mm.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-26 10:57:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-26 10:57:51 +0200
commit5dc2c99055ae4a95336f28c58c8c8da4033979f1 (patch)
tree2e0633e3a1113c1d80de5659efca98a05ab8ca14 /libavformat/mm.c
parentbbc7d33a0d7dad79f3d514349b0ba321121b80fe (diff)
parent93a51984a27f3ba84d4e6f13d0c704ee9891603e (diff)
downloadffmpeg-5dc2c99055ae4a95336f28c58c8c8da4033979f1.tar.gz
Merge commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e'
* commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e': mpeg12: Ignore slice threading if hwaccel is active Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mm.c')
0 files changed, 0 insertions, 0 deletions