diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:37:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:38:55 +0100 |
| commit | 60feb8543a568e15228c7d4531a9c665868df97e (patch) | |
| tree | cac88a8571c4ec999dfd74c09477721914471000 /doc/examples/muxing.c | |
| parent | 3eaef560a71f63989f105949accf0d023e92ea07 (diff) | |
| parent | d6deed7916f7f52dbfc88e2fc2c43e3cfb8ee74b (diff) | |
| download | ffmpeg-60feb8543a568e15228c7d4531a9c665868df97e.tar.gz | |
Merge commit 'd6deed7916f7f52dbfc88e2fc2c43e3cfb8ee74b' into release/0.10
* commit 'd6deed7916f7f52dbfc88e2fc2c43e3cfb8ee74b':
h264_cabac: Break infinite loops
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/muxing.c')
0 files changed, 0 insertions, 0 deletions