diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-23 21:59:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-23 22:03:21 +0100 |
| commit | e40cdf8604f14feaa41323ae8fdfdf187a257d55 (patch) | |
| tree | 4e40f0cbf5dd2a0dc0270108f89d21c69a9b2333 /ffmpeg_dxva2.c | |
| parent | 72d99c8c2647c77e01dfc82a354d500d48258469 (diff) | |
| parent | 2a06c2a03e1205aaeede5af850b9271752ddd4cf (diff) | |
| download | ffmpeg-e40cdf8604f14feaa41323ae8fdfdf187a257d55.tar.gz | |
Merge commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf'
* commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf':
mpegvideo_enc: Draw edges on input for non-multiple of 16 resolutions
Conflicts:
libavcodec/mpegvideo_enc.c
See: 1e78679768b3a1ef336c5b52aa5027d8a50fcf0d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_dxva2.c')
0 files changed, 0 insertions, 0 deletions