[FFmpeg-cvslog] Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov  3 14:23:36 2012 +0100| [37e81996dcf3452c48dd134877bf10b5060dacb3] | committer: Michael Niedermayer

Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'

* commit '9221efef7968463f3e3d9ce79ea72eaca082e73f':
  lavf: fix av_interleaved_write_frame() doxy.
  lavf: clarify the lifetime of demuxed packets.
  avconv: do not free muxed packet on streamcopy.
  crc: move doxy to the header
  vf_drawtext: do not use deprecated av_tree_node_size
  x86: Refactor PSWAPD fallback implementations and port to cpuflags

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37e81996dcf3452c48dd134877bf10b5060dacb3
---