diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 01:29:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 01:29:19 +0200 |
| commit | 9f028b3f3af549a95b4a50af6a1d02acc5089a9f (patch) | |
| tree | abc64a309f89923734a7b2542f6d1bfa535e12d6 /ffmpeg_dxva2.c | |
| parent | eb0fc73dcc85268f43fe6978342acf8eb90f72fe (diff) | |
| parent | 49106844929b7b71ac719064d640f8aa56c89b1f (diff) | |
| download | ffmpeg-9f028b3f3af549a95b4a50af6a1d02acc5089a9f.tar.gz | |
Merge commit '49106844929b7b71ac719064d640f8aa56c89b1f'
* commit '49106844929b7b71ac719064d640f8aa56c89b1f':
tiffenc: fix packet size calculation
Conflicts:
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_dxva2.c')
0 files changed, 0 insertions, 0 deletions