diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-16 14:06:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-16 14:10:31 +0200 |
| commit | b3970b39491ffab25a9c922f384855aca81d50b2 (patch) | |
| tree | e7028548ef317b2e5deeab4528220af153dfe753 /libavcodec/dv_tablegen.h | |
| parent | e0fcd0294e2f6cc9a3ade974a561be54c9efbc31 (diff) | |
| parent | 6fc8226e29055858f28973bb3d27b63b3b65e616 (diff) | |
| download | ffmpeg-b3970b39491ffab25a9c922f384855aca81d50b2.tar.gz | |
Merge commit '6fc8226e29055858f28973bb3d27b63b3b65e616'
* commit '6fc8226e29055858f28973bb3d27b63b3b65e616':
vp3: Check the framerate for validity
Conflicts:
libavcodec/vp3.c
See: a56d963f111b1a192cdabb05500f8083bd77ca93
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dv_tablegen.h')
0 files changed, 0 insertions, 0 deletions