diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 10:36:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 10:38:51 +0200 |
| commit | 43dec5ef9a360c9ffac3278f464832bd99af0cb0 (patch) | |
| tree | 5a04cf0f141eca962a06c82134c3977cc801ebe4 /libavformat/nut.h | |
| parent | d3850ac5b9c7e0f6cd77d652a3a8985c6ca6732a (diff) | |
| parent | c9ef6b09326a24010bf86d6b0d19cfa42df4d546 (diff) | |
| download | ffmpeg-43dec5ef9a360c9ffac3278f464832bd99af0cb0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo4: Check the inherited quant_mat
Conflicts:
libavcodec/indeo4.c
See: 884efd4e09696b201457feebdef684aee30be99d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nut.h')
0 files changed, 0 insertions, 0 deletions