diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 12:55:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 12:55:21 +0100 |
| commit | ed8de1570db856ba830c3e4b19b5628ab24a8853 (patch) | |
| tree | f294d2fd0292809bffe8a29039f39f6fb160d27b /libavutil/opencl_internal.h | |
| parent | 5f2cdf9c3cc5e1159428999ec550a3979576c213 (diff) | |
| parent | f9f883af4fe615a832407a657752e248a96c6280 (diff) | |
| download | ffmpeg-ed8de1570db856ba830c3e4b19b5628ab24a8853.tar.gz | |
Merge commit 'f9f883af4fe615a832407a657752e248a96c6280'
* commit 'f9f883af4fe615a832407a657752e248a96c6280':
h264: simplify code in flush_dpb()
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opencl_internal.h')
0 files changed, 0 insertions, 0 deletions