diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 18:47:20 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 18:47:24 +0200 |
commit | 6596f5c3aa9add4600cb0f3c939fd639d89f6a70 (patch) | |
tree | 42f11205476a61f5443565053265ae99a0f64e94 /doc/examples/decoding_encoding.c | |
parent | a457115f0f09b1868aa4c3a0eeca2e1b3f0dd78b (diff) | |
parent | cf6b2a0ad2b06aabf04bec4c7b19e78a560cd904 (diff) | |
download | ffmpeg-6596f5c3aa9add4600cb0f3c939fd639d89f6a70.tar.gz |
Merge commit 'cf6b2a0ad2b06aabf04bec4c7b19e78a560cd904' into release/0.10
* commit 'cf6b2a0ad2b06aabf04bec4c7b19e78a560cd904':
cdgraphics: do not return 0 from the decode function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/decoding_encoding.c')
0 files changed, 0 insertions, 0 deletions