diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 11:40:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 11:40:30 +0100 |
| commit | 0f057ea3c5484d7df8a951c1fdeb8b873ae382e2 (patch) | |
| tree | dd8672f17b58a14f57e62437ea8123f77a93f868 /ffmpeg_vdpau.c | |
| parent | b342ea603f0c767759639a002b9db638231e989c (diff) | |
| parent | 86eb2eaac629909d6ee4067c6f1e485a4e70473d (diff) | |
| download | ffmpeg-0f057ea3c5484d7df8a951c1fdeb8b873ae382e2.tar.gz | |
Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'
* commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d':
mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc()
Conflicts:
libavcodec/mjpegenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_vdpau.c')
0 files changed, 0 insertions, 0 deletions