diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 11:48:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 11:48:39 +0200 |
| commit | cd63252f1ff61d894a1c3a59fee7d1e49dbfdeb4 (patch) | |
| tree | 55dbcca36fb0ff5debc922d1ac185d4b6f1dcf5b /libswscale | |
| parent | e8a460672f7e9aec129a7cfa01345857b1565a15 (diff) | |
| parent | a6cd154463bea7eb56d28192db4c8c6d83f67fd7 (diff) | |
| download | ffmpeg-cd63252f1ff61d894a1c3a59fee7d1e49dbfdeb4.tar.gz | |
Merge commit 'a6cd154463bea7eb56d28192db4c8c6d83f67fd7'
* commit 'a6cd154463bea7eb56d28192db4c8c6d83f67fd7':
h264: move the DPB init/uninit to init_context()/free_context()
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions