diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-27 03:16:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-27 03:21:56 +0200 |
| commit | 28b1698a7cccded1df32a543321fd24af928e06c (patch) | |
| tree | 3603f43634bf4f4bc24a4b24f61827441a7232b7 /cmdutils_opencl.c | |
| parent | 01831fd004908f9dbc3777400169505a63a7adef (diff) | |
| parent | ce42316321145c435029dc288c2b5f1d48519dde (diff) | |
| download | ffmpeg-28b1698a7cccded1df32a543321fd24af928e06c.tar.gz | |
Merge commit 'ce42316321145c435029dc288c2b5f1d48519dde'
* commit 'ce42316321145c435029dc288c2b5f1d48519dde':
h264: Always invoke the get_format() callback
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils_opencl.c')
0 files changed, 0 insertions, 0 deletions