diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 01:29:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 01:45:22 +0200 |
| commit | 91b4ed09180c358f950ccbed4d3774178357add6 (patch) | |
| tree | fa9c8675d5d001e1092c0f425093c5d96979c782 /libavresample/avresample-test.c | |
| parent | 8dfb8190d768f5ea5924f06a59fffa9fa5f8308b (diff) | |
| parent | a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812 (diff) | |
| download | ffmpeg-91b4ed09180c358f950ccbed4d3774178357add6.tar.gz | |
Merge commit 'a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812'
* commit 'a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812':
cdgraphics: switch to bytestream2
Conflicts:
libavcodec/cdgraphics.c
See: ad002e1a13a8df934bd6cb2c84175a4780ab8942
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/avresample-test.c')
0 files changed, 0 insertions, 0 deletions