Changeset c130428a in ffmpeg

Timestamp:

Jan 19, 2012, 12:19:38 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1ce8377c

Parents:

6fd4b8a6 (diff), 0184bbe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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@gmx.at>

(No files)