Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Nov 2012 13:23:36 +0000 (14:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Nov 2012 13:24:11 +0000 (14:24 +0100)
commit37e81996dcf3452c48dd134877bf10b5060dacb3
tree46c9098620c5d3a73823b283e747eb23d95b8606
parent1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9
parent9221efef7968463f3e3d9ce79ea72eaca082e73f
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>
ffmpeg.c
libavcodec/x86/fft.asm
libavcodec/x86/fmtconvert.asm
libavfilter/vf_drawtext.c
libavformat/avformat.h
libavutil/crc.c
libavutil/crc.h
libavutil/x86/x86util.asm