diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 18:25:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 18:25:32 +0200 |
| commit | a457115f0f09b1868aa4c3a0eeca2e1b3f0dd78b (patch) | |
| tree | 7def240343e626091023293c6a833baea89eb4b9 /doc/examples/decoding_encoding.c | |
| parent | 90241187ceb6f3aa34e2783d0b69c3781af4026f (diff) | |
| parent | 3aebdffb010df025728d6c2af89642f9634aa806 (diff) | |
| download | ffmpeg-a457115f0f09b1868aa4c3a0eeca2e1b3f0dd78b.tar.gz | |
Merge commit '3aebdffb010df025728d6c2af89642f9634aa806' into release/0.10
* commit '3aebdffb010df025728d6c2af89642f9634aa806':
cdgraphics: switch to bytestream2
Conflicts:
libavcodec/cdgraphics.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/decoding_encoding.c')
0 files changed, 0 insertions, 0 deletions