diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-08 19:09:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-08 19:31:25 +0100 |
| commit | acfb54c076e25b5f228ab07d364738940e4171d3 (patch) | |
| tree | 8089459b180dcdcbb798f3446cab5db77dd83df4 /libavdevice/xcbgrab.c | |
| parent | 10e3e3aa8510bdf97f2d296872b334c16009acb1 (diff) | |
| parent | 0025f7408a0fab2cab4a950064e4784a67463994 (diff) | |
Merge commit '0025f7408a0fab2cab4a950064e4784a67463994'
* commit '0025f7408a0fab2cab4a950064e4784a67463994':
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 'libavdevice/xcbgrab.c')
0 files changed, 0 insertions, 0 deletions