diff options
author | Clément Bœsch <clement@stupeflix.com> | 2016-07-01 14:17:56 +0200 |
---|---|---|
committer | Clément Bœsch <clement@stupeflix.com> | 2016-07-01 14:19:09 +0200 |
commit | 2021326f995ff2eda5cd2aae600853f6eddb507d (patch) | |
tree | 262b8d03fc35f00a8a6e5d412cbb4f897fbff90b /doc/examples/transcoding.c | |
parent | 99b37f53a13d6e2453c65b12fd0c0e025310021f (diff) | |
parent | d1f539c97e04e7cebecaf6916c5064f243d39fcf (diff) | |
download | ffmpeg-2021326f995ff2eda5cd2aae600853f6eddb507d.tar.gz |
Merge commit 'd1f539c97e04e7cebecaf6916c5064f243d39fcf'
* commit 'd1f539c97e04e7cebecaf6916c5064f243d39fcf':
h264: merge the two reinit blocks in slice_header_parse()
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'doc/examples/transcoding.c')
0 files changed, 0 insertions, 0 deletions