diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:24:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:24:23 +0100 |
| commit | c27f53b9fbcd8f638afecc637ef844b612cc39be (patch) | |
| tree | 7c6588de62ee97cddb5ddd1f6c77fd4fb7a0c9d3 /tools/missing_codec_desc | |
| parent | cc31d9ce80abd8b2a1a446f73a8651e2f1d76853 (diff) | |
| parent | d231e84b06a9964c840cff4e228509f706165fb6 (diff) | |
| download | ffmpeg-c27f53b9fbcd8f638afecc637ef844b612cc39be.tar.gz | |
Merge commit 'd231e84b06a9964c840cff4e228509f706165fb6'
* commit 'd231e84b06a9964c840cff4e228509f706165fb6':
h264: move the quantizers into the per-slice context
Conflicts:
libavcodec/dxva2_h264.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/missing_codec_desc')
0 files changed, 0 insertions, 0 deletions