diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-27 03:12:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-27 03:18:27 +0200 |
| commit | 50ffd8439c9306a761a279d470564ad9688e3689 (patch) | |
| tree | 12bbc4d10f7a883a48eb9679e6149114f44d489a | |
| parent | cdf6a9441ded7df881de388229c26354e42b0872 (diff) | |
| parent | b03b2d86aa9d79670825b42d8a8a7c41f59cb444 (diff) | |
Merge commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444'
* commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444':
buffersrc: avoid using AV_PIX_FMT_NB
Conflicts:
libavfilter/buffersrc.c
No change as AV_PIX_FMT_NB was not used by our buffersrc.c
See: 0d58bbb28d90a16bdb0ece6f5c67e12167a67a0f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions