diff options
| author | Michael Niedermayer <[email protected]> | 2013-03-08 19:35:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-03-08 19:35:37 +0100 |
| commit | fee484edaff77fc831d4cbbdd259ea0948103f86 (patch) | |
| tree | b8b7ba5d51cbb3da036a9e28534575aa8419e4ca /libavfilter/lswsutils.h | |
| parent | d9d97f9b3374ee740a6f7218aecb0f5d6cec8f57 (diff) | |
| parent | ad0c9f2d5d81e22207c6ccecc426bf7306acc327 (diff) | |
Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327'
* commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327':
lavc: move AVFrame.hwaccel_picture_private to Picture.
Conflicts:
libavcodec/avcodec.h
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavfilter/lswsutils.h')
0 files changed, 0 insertions, 0 deletions