diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 15:45:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 15:45:19 +0200 |
| commit | 420f63984b39dbc847295126ee2e701df068dd53 (patch) | |
| tree | 86789ed659d3d38b5bccff46bc62d6fe0927800a /libavformat/utils.c | |
| parent | 91437631d76f8ba966c370df56795bf1cf2045ad (diff) | |
| parent | 8cd67ddde46a42a33149e7d42a2ab47852ff2a83 (diff) | |
| download | ffmpeg-420f63984b39dbc847295126ee2e701df068dd53.tar.gz | |
Merge commit '8cd67ddde46a42a33149e7d42a2ab47852ff2a83' into release/1.1
* commit '8cd67ddde46a42a33149e7d42a2ab47852ff2a83':
cdgraphics: switch to bytestream2
Conflicts:
libavcodec/cdgraphics.c
See: ad002e1a13a8df934bd6cb2c84175a4780ab8942
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions