diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 14:18:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 15:21:20 +0200 |
| commit | bd7dce594ea76b3d9a898c6ceb55ccc91ec76001 (patch) | |
| tree | 69aeb5eb38e8f33adfe129c36b998471548110f5 /libavfilter/lavfutils.h | |
| parent | cc87493f0654b3bf7d108df90bad4313d993576b (diff) | |
| parent | 88c612e3a4d5b584e2d9f6e2541de78d67bdfb9f (diff) | |
| download | ffmpeg-bd7dce594ea76b3d9a898c6ceb55ccc91ec76001.tar.gz | |
Merge commit '88c612e3a4d5b584e2d9f6e2541de78d67bdfb9f'
* commit '88c612e3a4d5b584e2d9f6e2541de78d67bdfb9f':
h264: merge the init and reinit paths in update_thread_context()
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/lavfutils.h')
0 files changed, 0 insertions, 0 deletions