Merge commit 'f593628e5868e52a46de666767896c6afcebdae4'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Aug 2011 22:03:59 +0000 (00:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Aug 2011 22:12:05 +0000 (00:12 +0200)
* commit 'f593628e5868e52a46de666767896c6afcebdae4':
  avconv: Replace raw picture frame swapping hack.
  RV40: reuse some H.264 motion compensation functions in RV40.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
avconv.c
ffmpeg.c
libavcodec/rv40dsp.c

diff --cc avconv.c
Simple merge
diff --cc ffmpeg.c
+++ b/ffmpeg.c
@@@ -1135,13 -1130,13 +1135,12 @@@ static void do_video_out(AVFormatContex
                           AVFrame *in_picture,
                           int *frame_size, float quality)
  {
 -    int nb_frames, i, ret, resample_changed;
 -    AVFrame *final_picture, *formatted_picture;
 -    AVCodecContext *enc, *dec;
 +    int nb_frames, i, ret, format_video_sync;
 +    AVFrame *final_picture;
-     AVCodecContext *enc, *dec;
++    AVCodecContext *enc;
      double sync_ipts;
  
      enc = ost->st->codec;
--    dec = ist->st->codec;
  
      sync_ipts = get_sync_ipts(ost) / av_q2d(enc->time_base);
  
  
          if (s->oformat->flags & AVFMT_RAWPICTURE) {
              /* raw pictures are written as AVPicture structure to
 -               avoid any copies. We support temorarily the older
 +               avoid any copies. We support temporarily the older
                 method. */
--            AVFrame* old_frame = enc->coded_frame;
--            enc->coded_frame = dec->coded_frame; //FIXME/XXX remove this hack
++            enc->coded_frame->interlaced_frame = in_picture->interlaced_frame;
++            enc->coded_frame->top_field_first  = in_picture->top_field_first;
              pkt.data= (uint8_t *)final_picture;
              pkt.size=  sizeof(AVPicture);
              pkt.pts= av_rescale_q(ost->sync_opts, enc->time_base, ost->st->time_base);
              pkt.flags |= AV_PKT_FLAG_KEY;
  
              write_frame(s, &pkt, ost->st->codec, ost->bitstream_filters);
--            enc->coded_frame = old_frame;
          } else {
              AVFrame big_picture;
  
Simple merge