[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Thu Jan 19 01:35:33 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 19 01:19:38 2012 +0100| [c130428ab5a17911d0bfa11f804ec05e6f7a53e6] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avprobe, cmdutils: K&R formatting cosmetics
tests: K&R formatting cosmetics for test programs
lavf: free packets for muxers implementing interleave_packet().
lavf: fix and extend av_interleaved_write_frame() doxy.
mov: Remove dead stores for spherical coordinates for channel position.
error_resilience: K&R formatting cosmetics
RELEASE_NOTES: mention hiding private symbols in shared builds.
RELEASE_NOTES: mention some notable API changes in 0.8
Conflicts:
cmdutils.h
doc/RELEASE_NOTES
ffprobe.c
libavcodec/error_resilience.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c130428ab5a17911d0bfa11f804ec05e6f7a53e6
---
More information about the ffmpeg-cvslog
mailing list