diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:39:06 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:39:06 +0200 |
| commit | 7fe7cdca3665b8ab1863f8f79e6881c1c4d1b630 (patch) | |
| tree | a59c7c8573fe4b41e809197c0e4fdd91b33d78e9 /libavformat/asf.c | |
| parent | c9ee36e60ffb2986acf7decacf6ef6e1da657d61 (diff) | |
| parent | fe7b21c8f148493c6fbceb7f887a77531dd1ae0e (diff) | |
| download | ffmpeg-7fe7cdca3665b8ab1863f8f79e6881c1c4d1b630.tar.gz | |
Merge commit 'fe7b21c8f148493c6fbceb7f887a77531dd1ae0e'
* commit 'fe7b21c8f148493c6fbceb7f887a77531dd1ae0e':
avconv: fix parsing bitstream filters
Not merged because ffmpeg_opt.c still uses the old BSF API.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/asf.c')
0 files changed, 0 insertions, 0 deletions