Merge commit '7fa72700298107fe756311ecb4dee5270ff12d35' into release/0.10
[ffmpeg.git] / libavformat / omaenc.c
2012-01-10 Michael NiedermayerMerge remote-tracking branch 'hexene/stagefright'
2012-01-03 Michael NiedermayerMerge remote-tracking branch 'shariman/wmall'
2011-12-24 Michael NiedermayerMerge remote-tracking branch 'shariman/wmall'
2011-12-19 Michael NiedermayerMerge remote-tracking branch 'qatar/master'
2011-12-18 Michael Karcherlavf: add OpenMG audio muxer.