diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-05 17:09:46 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-05 17:09:55 +0400 |
| commit | 22ffa5390f6b4bb99fc6cd1fb0f629f6c3a9ba8d (patch) | |
| tree | ac271edc3a53d815728c2ca5b287d508442ba6c3 /ffmpeg.h | |
| parent | 1efc08921868c882427444e2beb9832e221b24cd (diff) | |
| parent | 01947f07b81a57fb1e15114b710f6d5ae4f70a11 (diff) | |
Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'
* commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11':
avconv: remove a useless line
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions