diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-01 15:13:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-01 15:13:07 +0200 |
| commit | 599866f5d5e6d27657a3f4f5d4c1bc8785143c99 (patch) | |
| tree | 3a5f0ffeecd3842ea29830db371f52dda1ca4748 /libavformat/oggparseflac.c | |
| parent | ce841bc0326327b73659d7157ebcf25f235ef470 (diff) | |
| parent | 52853077ee49db8ecb6f83d0f9a177708b5d93a6 (diff) | |
| download | ffmpeg-599866f5d5e6d27657a3f4f5d4c1bc8785143c99.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi/af_asetnsamples: fix EOF handling.
lavu/opt: make sure av_opt_set_bin() handles NULL/0.
lavd/v4l2: fully init an ioctl argument.
lavfi: detect merge failure for unknown layouts.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparseflac.c')
0 files changed, 0 insertions, 0 deletions