diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 13:27:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 13:27:31 +0200 |
| commit | d8d235ffe9c13ed129010f3d367a341fab448839 (patch) | |
| tree | 342f9ac420ccfe6d9fb9a361e4622a7adf6b761c /libavfilter/lavfutils.c | |
| parent | fc424f37a37ee6ba6fb679db746775b63f602267 (diff) | |
| parent | 5c349ad08a9fa930ddd9339f5de83eb818a0994c (diff) | |
| download | ffmpeg-d8d235ffe9c13ed129010f3d367a341fab448839.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lxf: check the nb_streams instead of relying on padding
Conflicts:
libavformat/lxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/lavfutils.c')
0 files changed, 0 insertions, 0 deletions