diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 00:27:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 00:27:53 +0100 |
| commit | d208977cd1c47ddc0281186a6f0521b4b4bd6c1a (patch) | |
| tree | 65348fa18e4a9c70791ab3c508f9a918d5d4fb17 /libavcodec/h264data.h | |
| parent | 0abd926d64a75c78e89bfc40c5398bcf45b6824b (diff) | |
| parent | 7136a0bf88f31bb8d40a3bbd251963706fb14578 (diff) | |
| download | ffmpeg-d208977cd1c47ddc0281186a6f0521b4b4bd6c1a.tar.gz | |
Merge commit '7136a0bf88f31bb8d40a3bbd251963706fb14578' into release/2.4
* commit '7136a0bf88f31bb8d40a3bbd251963706fb14578':
vorbis: Check the vlc value in setup_classifs
Conflicts:
libavcodec/vorbisdec.c
See: ae038c0914460646503be083e30e3971093239a1
See: 709cae2bcbc0ea2c5d46c932b3d8301cf8f98e6b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264data.h')
0 files changed, 0 insertions, 0 deletions