diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 03:54:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 03:54:11 +0200 |
| commit | a64d6d5152189fce84bded8c73af5b49d6657cce (patch) | |
| tree | 1bce125c970a611818911b5760403e6652b930e4 /libavcodec/parser.h | |
| parent | b9b2f9d218bad3001edc64704865987fd7cf7dca (diff) | |
| parent | 345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe (diff) | |
| download | ffmpeg-a64d6d5152189fce84bded8c73af5b49d6657cce.tar.gz | |
Merge commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe'
* commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe':
tiffdec: remove an unneeded variable
Conflicts:
libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/parser.h')
0 files changed, 0 insertions, 0 deletions