diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:15:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:15:46 +0100 |
| commit | b27ba2e540b873fe8e50280a734194ada002a077 (patch) | |
| tree | ab788acddcf6a588e2007488defd2c763b6c7dba /libavutil/timer.h | |
| parent | aeead427896a632c09c13c2b90ba096bf8678ef1 (diff) | |
| parent | 6e81597d5a89f64dfab5c7e99e46b4355139e324 (diff) | |
| download | ffmpeg-b27ba2e540b873fe8e50280a734194ada002a077.tar.gz | |
Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'
* commit '6e81597d5a89f64dfab5c7e99e46b4355139e324':
mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/timer.h')
0 files changed, 0 insertions, 0 deletions