diff options
| author | Michael Niedermayer <[email protected]> | 2013-03-08 20:18:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-03-08 20:33:26 +0100 |
| commit | c4e8821732999f720535bb2eb1e8c7f1ea1db18f (patch) | |
| tree | 12b31863b7145b0342207aafd0ffa256da2904b9 /libavfilter/lswsutils.h | |
| parent | fee484edaff77fc831d4cbbdd259ea0948103f86 (diff) | |
| parent | 7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e (diff) | |
Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'
* commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e':
Move AVFrame from lavc to lavu.
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavfilter/lswsutils.h')
0 files changed, 0 insertions, 0 deletions