diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 21:56:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 21:56:50 +0200 |
| commit | abae926ef80c8553c732b95649d334b7a91374d3 (patch) | |
| tree | ec37d08707415640b4d603d5fa2a6a462a0a333e /libavfilter/bbox.c | |
| parent | e6c710600e1d474b53e52398969140f79052bfde (diff) | |
| parent | e1f907711a91e5ce19402a1831cfbe8f709b67f7 (diff) | |
| download | ffmpeg-abae926ef80c8553c732b95649d334b7a91374d3.tar.gz | |
Merge commit 'e1f907711a91e5ce19402a1831cfbe8f709b67f7'
* commit 'e1f907711a91e5ce19402a1831cfbe8f709b67f7':
h264: factor out common code from init() and init_thread_copy()
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/bbox.c')
0 files changed, 0 insertions, 0 deletions