diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 21:33:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 21:34:45 +0100 |
| commit | 8d6b51b18206a133d985f4cc065945b696ed5058 (patch) | |
| tree | 0e212cce5208d225f9d1672eee0a81dd92ab6d36 /ffmpeg_dxva2.c | |
| parent | d3127691665ca071e6b090283b677efc9f2de8f1 (diff) | |
| parent | db71c4926d948717ce3b74253eb385dc43dcb14d (diff) | |
| download | ffmpeg-8d6b51b18206a133d985f4cc065945b696ed5058.tar.gz | |
Merge commit 'db71c4926d948717ce3b74253eb385dc43dcb14d'
* commit 'db71c4926d948717ce3b74253eb385dc43dcb14d':
mjpegenc: fix argument size in encode_mb
Conflicts:
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h
See: 256f530603ef3838a712a4fcd737b46b7bce455e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_dxva2.c')
0 files changed, 0 insertions, 0 deletions