diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 21:49:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 21:50:21 +0100 |
| commit | e136579ca358093caa6b0a4941717ae7ef1f90b2 (patch) | |
| tree | f0223596844f07b21241e93f2b66f64d8562e672 /libavcodec/bethsoftvideo.c | |
| parent | efec857c9f70113bdbcc18e03a5bcadcdca9f9a1 (diff) | |
| parent | 3fbad00714698f59c6326edfcc63db87f525e7c0 (diff) | |
| download | ffmpeg-e136579ca358093caa6b0a4941717ae7ef1f90b2.tar.gz | |
Merge commit '3fbad00714698f59c6326edfcc63db87f525e7c0'
* commit '3fbad00714698f59c6326edfcc63db87f525e7c0':
utvideoenc: Enable support for multiple slices and use them
Conflicts:
libavcodec/utvideoenc.c
tests/fate/utvideo.mak
See: efec857c9f70113bdbcc18e03a5bcadcdca9f9a1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bethsoftvideo.c')
0 files changed, 0 insertions, 0 deletions