diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:15:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:15:49 +0200 |
| commit | cdfd61b78ba6026b51526661daad6cd708fab352 (patch) | |
| tree | b5cdd019de0de23df9c90b860586108a002e07fd /doc/examples/decoding_encoding.c | |
| parent | f3ae90621e03e2d91201e4f863c6d5b61555cadd (diff) | |
| parent | 28f2d3c5a5a3a3c14a68cf691054f15e4f23355a (diff) | |
| download | ffmpeg-cdfd61b78ba6026b51526661daad6cd708fab352.tar.gz | |
Merge commit '28f2d3c5a5a3a3c14a68cf691054f15e4f23355a' into release/0.10
* commit '28f2d3c5a5a3a3c14a68cf691054f15e4f23355a':
cmdutils: Conditionally compile libswscale-related bits
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/decoding_encoding.c')
0 files changed, 0 insertions, 0 deletions