diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-05 14:12:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-05 14:12:50 +0100 |
| commit | 95b13fb96f7e46239b754108d077e76296f9bd27 (patch) | |
| tree | 61e1f23495e0f0accb8b48b9d50e5bf909c83d7e /libavformat/oggdec.h | |
| parent | d92a725329e5fe315fd42ab1ef38a97aa8f94aba (diff) | |
| parent | 23e77f0e33b706ffdcf31a22189a61f1283aaa18 (diff) | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: flush subtitle codecs as well with null packets
ffplay: reorder the filters to ensure that inputs of the custom filters are merged first
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggdec.h')
0 files changed, 0 insertions, 0 deletions