diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-21 21:13:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-21 21:14:36 +0200 |
| commit | df3850db4958c44e8e4d5aa0fece71c03a51372b (patch) | |
| tree | dc747b463c44fd26356f0228f88cb387f31c1820 /doc/examples/muxing-example.c | |
| parent | 082b4f8348c6d8fc110969692c2a2ccf81f4e20c (diff) | |
| parent | 250cebeb3b348c3da71f9972eb500d6005dc01f1 (diff) | |
| download | ffmpeg-df3850db4958c44e8e4d5aa0fece71c03a51372b.tar.gz | |
Merge branch 'master' into oldabi
* master:
release_notes: document not fully understood mingw-sdl issue
release_notes: some updates
presets: forgotten libvpx presets
release_notes: fix version
release_notes: mention more codecs Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
release_notes: there will be 2 releases each for one ABI/API.
release_notes: suggest git log instead of the poorly maintained APIChanges
release_notes: we do support releases
build system: disable memalign on haiku, its not reliable there.
ffprobe: remove duplicate avformat_alloc_context()
Fix segmentation fault in ffprobe
wma: fix infinite loop
Fix H.264 4:4:4 lossless decoding.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/muxing-example.c')
0 files changed, 0 insertions, 0 deletions