aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vble.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-27 21:03:35 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-27 21:09:17 +0100
commitf392949f1ac799ad1d7c1cda66e41c1670022d5a (patch)
treee3b97d59c99dfc21cf92abb7b71305f4e59f408a /libavcodec/vble.c
parent68014c6ed98b5c90f4dc211429dd269ac727be4b (diff)
parentae17878fb2ab100264226c84c58f5b95a703312f (diff)
downloadffmpeg-f392949f1ac799ad1d7c1cda66e41c1670022d5a.tar.gz
Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f'
* commit 'ae17878fb2ab100264226c84c58f5b95a703312f': BRender PIX image decoder Conflicts: doc/general.texi libavcodec/Makefile libavcodec/version.h See: 492a5f835c59ab7c2e347d3579d8bf6148ae0a0, and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vble.c')
0 files changed, 0 insertions, 0 deletions