aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-03 12:21:25 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-03 12:21:25 +0200
commitc3660c361822ffa9ae4fc47f655adab52a0f3c57 (patch)
tree5a872b20159f0885fce7ec3673f33da9725653cd /libavcodec/utils.c
parent45a73d2b472ffcc0d87f3efae3424c44976d6935 (diff)
parent0aed0bfc62b273a780a2bfba3be56039fccd7423 (diff)
downloadffmpeg-c3660c361822ffa9ae4fc47f655adab52a0f3c57.tar.gz
Merge commit '0aed0bfc62b273a780a2bfba3be56039fccd7423'
* commit '0aed0bfc62b273a780a2bfba3be56039fccd7423': vmd: fix mode 3 decoding Conflicts: libavcodec/vmdav.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
0 files changed, 0 insertions, 0 deletions