diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 00:38:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 00:38:13 +0200 |
| commit | 37ce3188decae50a14c1d430c49ecc369d5876a6 (patch) | |
| tree | a5b4eed88d1b50260a36e417e94c991184a8bfc6 /ffmpeg_dxva2.c | |
| parent | b3d48c315dece7bc599012075cc92e9a80cdd6ec (diff) | |
| parent | 9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521 (diff) | |
| download | ffmpeg-37ce3188decae50a14c1d430c49ecc369d5876a6.tar.gz | |
Merge commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521'
* commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521':
h264: drop commented out cruft
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_dxva2.c')
0 files changed, 0 insertions, 0 deletions