Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Jul 2011 21:57:11 +0000 (23:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Jul 2011 21:57:11 +0000 (23:57 +0200)
* qatar/master:
  ffserver: remove unused variable.
  Remove unused and outdated TODO file.
  gitignore: Drop individual .d ignore; it is already covered by a wildcard.
  lavf: deprecate AVStream.quality.
  bink: pass Bink version to audio decoder through extradata instead of codec_tag.
  libpostproc: Remove disabled code.
  flashsv: improve some comments and fix some wrong ones
  flashsv: Eliminate redundant variable indirection.
  flashsv: set reference frame type to full frame
  flashsv: replace bitstream description by a link to the specification
  flashsv: convert a debug av_log into av_dlog
  flashsv: simplify condition
  flashsv: return more meaningful error values
  flashsv: cosmetics: break some overly long lines
  flashsv: cosmetics: drop some unnecessary parentheses
  swscale: amend documentation to mention use of native depth for scaling.
  eval: add missing comma to tests.
  eval: fix memleak.
  H.264: make loopfilter bS const where applicable

Conflicts:
libavcodec/binkaudio.c
libavformat/bink.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
15 files changed:
1  2 
.gitignore
ffmpeg.c
ffserver.c
libavcodec/binkaudio.c
libavcodec/flashsv.c
libavcodec/h264_loopfilter.c
libavformat/avformat.h
libavformat/bink.c
libavformat/ffmdec.c
libavformat/ffmenc.c
libavformat/version.h
libavutil/eval.c
libpostproc/postprocess.c
libswscale/swscale_internal.h
tests/ref/fate/eval

diff --cc .gitignore
Simple merge
diff --cc ffmpeg.c
+++ b/ffmpeg.c
@@@ -1155,9 -1123,9 +1155,9 @@@ static void do_video_out(AVFormatContex
                           AVOutputStream *ost,
                           AVInputStream *ist,
                           AVFrame *in_picture,
-                          int *frame_size)
+                          int *frame_size, float quality)
  {
 -    int nb_frames, i, ret, resample_changed;
 +    int nb_frames, i, ret, av_unused resample_changed;
      AVFrame *final_picture, *formatted_picture;
      AVCodecContext *enc, *dec;
      double sync_ipts;
@@@ -1734,9 -1684,10 +1735,10 @@@ static int output_packet(AVInputStream 
                          case AVMEDIA_TYPE_VIDEO:
  #if CONFIG_AVFILTER
                              if (ost->picref->video && !ost->frame_aspect_ratio)
 -                                ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect;
 +                                ost->st->codec->sample_aspect_ratio = ost->picref->video->sample_aspect_ratio;
  #endif
-                             do_video_out(os, ost, ist, &picture, &frame_size);
+                             do_video_out(os, ost, ist, &picture, &frame_size,
+                                          same_quality ? quality : ost->st->codec->global_quality);
                              if (vstats_filename && frame_size)
                                  do_video_stats(os, ost, frame_size);
                              break;
diff --cc ffserver.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge