Michael Niedermayer 37e81996dc 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@gmx.at>

2012-11-03 14:24:11 +01:00

108 KiB

Raw Blame History

View Raw