aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/dtshddec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-27 11:51:33 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-27 11:51:33 +0100
commitace0cfea60a32c2d2c89ce31fed8466625b09ac6 (patch)
tree442bd781b252ab542a7ebbc8b6a0435ae8cab05d /libavformat/dtshddec.c
parent12f203a0987935b79870a9502b7e148fa064897c (diff)
parent05fa79b8448059913dea321fdf92764b64deeecc (diff)
downloadffmpeg-ace0cfea60a32c2d2c89ce31fed8466625b09ac6.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: hwaccel: fix use with frame based multithreading Conflicts: libavcodec/h263dec.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/dtshddec.c')
0 files changed, 0 insertions, 0 deletions