aboutsummaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-28 11:54:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-10-28 11:54:46 +0100
commitd57a6fe6abdab934063b809e43096bf887d01696 (patch)
tree96870fe8697376c54185274de467cbd0fc5f1af3 /README
parentc985966a10599219bf52d21aebdf203d669c8c60 (diff)
parent0749314886390f6ec81d45e0ba424fcb36c945cf (diff)
downloadffmpeg-d57a6fe6abdab934063b809e43096bf887d01696.tar.gz
Merge commit '0749314886390f6ec81d45e0ba424fcb36c945cf'
* commit '0749314886390f6ec81d45e0ba424fcb36c945cf': h263: Return meaningful errors Conflicts: libavcodec/h263dec.c See: 7b62d3415e8e44618cb97775567d453295c4f4d9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions