diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 02:15:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 02:16:41 +0200 |
| commit | 801b94a78294cd90efc1e87fb1f03948203e88db (patch) | |
| tree | a06c21ce1be8d82db1160aff678b6a549660f86a /cmdutils_opencl.c | |
| parent | 46ff8108f6b4bb3c74c476ddcbb4c92ad928a202 (diff) | |
| parent | 729d821fd864a0568f4068e64d3a70faa23b9309 (diff) | |
| download | ffmpeg-801b94a78294cd90efc1e87fb1f03948203e88db.tar.gz | |
Merge commit '729d821fd864a0568f4068e64d3a70faa23b9309'
* commit '729d821fd864a0568f4068e64d3a70faa23b9309':
libmp3lame: allow joint stereo to be disabled
Conflicts:
libavcodec/libmp3lame.c
libavcodec/version.h
See: 1de11a7cab5346030a134774fbc23b3fc523a003
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils_opencl.c')
0 files changed, 0 insertions, 0 deletions