diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 04:42:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 04:42:04 +0200 |
| commit | e9cd8f4d20cfe47bef5a2e95ace6b75a347eca68 (patch) | |
| tree | 73a317ec2d6dc72b7ef2f983ca75515cd78dcca9 /libavfilter/vf_showinfo.c | |
| parent | c1e7fb60d1ea397e4833b71cf50825a0f2a5b61e (diff) | |
| parent | b7616f5716dce68c749d5dfeab19cf595a11807c (diff) | |
| download | ffmpeg-e9cd8f4d20cfe47bef5a2e95ace6b75a347eca68.tar.gz | |
Merge commit 'b7616f5716dce68c749d5dfeab19cf595a11807c'
* commit 'b7616f5716dce68c749d5dfeab19cf595a11807c':
huffyuv: Eliminate some pointless casts
Conflicts:
libavcodec/huffyuvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_showinfo.c')
0 files changed, 0 insertions, 0 deletions