diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:58:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:58:59 +0200 |
| commit | 8097307bfb6a90d18d35a870ff61016111820ab7 (patch) | |
| tree | 1ebbdf511c4541ab5a55cff43cbb3ddd4a6b04f2 /libavutil/opencl.c | |
| parent | bbdef61850205f5af1a0a292fb7166c92726e93b (diff) | |
| parent | 12db891dcd57b305d6e3c1e22ea8204dc26edda1 (diff) | |
| download | ffmpeg-8097307bfb6a90d18d35a870ff61016111820ab7.tar.gz | |
Merge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1'
* commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1':
avf: move ff_write_chained to mux.c
Conflicts:
libavformat/mux.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opencl.c')
0 files changed, 0 insertions, 0 deletions