aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/v210x.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-30 09:37:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-30 09:37:14 +0200
commit8ef89833d0a4829cbf471511d191a987f6933bba (patch)
tree6a5d90901ff57df43bf983d17f2abb850517ec49 /libavcodec/v210x.c
parent6635b13411a8a9399e57c73b79a16c60d6505a03 (diff)
parentc8f3cb9119c2183680d44a509a1b5a9817a3bee9 (diff)
downloadffmpeg-8ef89833d0a4829cbf471511d191a987f6933bba.tar.gz
Merge commit 'c8f3cb9119c2183680d44a509a1b5a9817a3bee9'
* commit 'c8f3cb9119c2183680d44a509a1b5a9817a3bee9': vmd: return meaningful errors Conflicts: libavcodec/vmdav.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/v210x.c')
0 files changed, 0 insertions, 0 deletions