diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 23:08:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 23:08:08 +0100 |
| commit | f7b041b11b0f1dcfe99918230b56859e6960b9f4 (patch) | |
| tree | e49ba8db5ac08182a38659581bde8789a0f993dd /libavfilter/buffersink.c | |
| parent | d85c9b036e65afa05dcc8fbf37813ef4a05db1f3 (diff) | |
| parent | 7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08 (diff) | |
Merge commit '7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08'
* commit '7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08':
lavc: remove disabled FF_API_FIND_BEST_PIX_FMT cruft
Conflicts:
libavcodec/avcodec.h
libavcodec/imgconvert.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/buffersink.c')
0 files changed, 0 insertions, 0 deletions