Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jan 2012 00:19:38 +0000 (01:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jan 2012 00:19:38 +0000 (01:19 +0100)
commitc130428ab5a17911d0bfa11f804ec05e6f7a53e6
treef306849a3482395433a246d50ec3b3a57c908c5a
parent6fd4b8a6ef13bd2d47521ed6894d25de45610291
parent0184bbe2d1e9a77ebe04e61f84a967662b79d387
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>
12 files changed:
cmdutils.h
doc/RELEASE_NOTES
ffprobe.c
libavcodec/error_resilience.c
libavformat/avformat.h
libavformat/mov.c
libavformat/utils.c
tests/audiogen.c
tests/base64.c
tests/rotozoom.c
tests/tiny_psnr.c
tests/videogen.c