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)
* 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>
1  2 
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

diff --cc ffmpeg.c
+++ b/ffmpeg.c
@@@ -1384,17 -1043,8 +1384,16 @@@ static void do_streamcopy(InputStream *
          opkt.size = pkt->size;
      }
  
 +    if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
 +        /* store AVPicture in AVPacket, as expected by the output format */
 +        avpicture_fill(&pict, opkt.data, ost->st->codec->pix_fmt, ost->st->codec->width, ost->st->codec->height);
 +        opkt.data = (uint8_t *)&pict;
 +        opkt.size = sizeof(AVPicture);
 +        opkt.flags |= AV_PKT_FLAG_KEY;
 +    }
 +
      write_frame(of->ctx, &opkt, ost);
      ost->st->codec->frame_number++;
-     av_free_packet(&opkt);
  }
  
  static void rate_emu_sleep(InputStream *ist)
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc libavutil/crc.c
Simple merge
diff --cc libavutil/crc.h
Simple merge
Simple merge