diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:20:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:20:54 +0100 |
| commit | cc31d9ce80abd8b2a1a446f73a8651e2f1d76853 (patch) | |
| tree | 4fd3a8d617429f87ca9469150eb10e26db130454 /libswresample/options.c | |
| parent | 756dc7bd18b88fdde5c06c701375a6570500e58c (diff) | |
| parent | d40ae0e595fe90b5583b9269f8bb000402bde5a6 (diff) | |
| download | ffmpeg-cc31d9ce80abd8b2a1a446f73a8651e2f1d76853.tar.gz | |
Merge commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6'
* commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6':
h264: do not copy qscale when updating per-thread contexts
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/options.c')
0 files changed, 0 insertions, 0 deletions