diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 10:21:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 10:21:16 +0200 |
| commit | aa6454e6ca7bb898e9fb1990bbcc821caf4ad51a (patch) | |
| tree | 3082aeec21d0683891220d99169d81f018f5df41 /doc/soc.txt | |
| parent | 85de84c3e0396be2e51298ca26e405ce629a9fa9 (diff) | |
| parent | 096696ef0dd391d9430376d1444c1a3cde9171fd (diff) | |
| download | ffmpeg-aa6454e6ca7bb898e9fb1990bbcc821caf4ad51a.tar.gz | |
Merge commit '096696ef0dd391d9430376d1444c1a3cde9171fd'
* commit '096696ef0dd391d9430376d1444c1a3cde9171fd':
avfiltergraph: simplify inserting conversion filters.
Clarify output of av_get_bits_per_pixel
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/soc.txt')
0 files changed, 0 insertions, 0 deletions