Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 May 2011 02:47:05 +0000 (04:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 May 2011 02:51:33 +0000 (04:51 +0200)
12 files changed, 36 insertions(+), 81 deletions(-)
yes thats 36 new lines in 14 commits

* qatar/master:
  ffmpeg: fix -aspect cli option
  Restructure video filter implementation in ffmpeg.c.
  ffplay: remove audio_write_get_buf_size() forward declaration
  lavfi: print key-frame and picture type information in ff_dlog_ref()
  mathops: remove ancient confusing comment
  cws2fws: Improve error message wording.
  tools: Check the return value of write().
  mpegaudio: move OUT_FMT macro to mpegaudiodec.c
  mpegaudio: remove OUT_MIN/MAX macros
  Add missing #includes to mp3_header_(de)compress bsf
  dct: fix indentation
  dct: bypass table allocation for DCT_II of size 32
  h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.
  Remove unused header mpegaudio3.h.

Conflicts:
ffmpeg.c
libavcodec/mpegaudio.h
libavcodec/mpegaudio3.h
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
ffmpeg.c
libavcodec/Makefile
libavcodec/dct.c
libavcodec/mathops.h
libavcodec/mp3_header_compress_bsf.c
libavcodec/mp3_header_decompress_bsf.c
libavcodec/mpegaudio.h
libavcodec/mpegaudiodec.c
libavcodec/x86/h264dsp_mmx.c
tools/pktdumper.c

diff --cc ffmpeg.c
+++ b/ffmpeg.c
@@@ -1642,15 -1557,19 +1641,15 @@@ static int output_packet(AVInputStream 
          }
  
  #if CONFIG_AVFILTER
-         if(ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO){
 -        if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
 -            for (i = 0; i < nb_ostreams; i++) {
++        if(ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
 +            for(i=0;i<nb_ostreams;i++) {
                  ost = ost_table[i];
                  if (ost->input_video_filter && ost->source_index == ist_index) {
 -                    AVRational sar;
 -                    if (ist->st->sample_aspect_ratio.num)
 -                        sar = ist->st->sample_aspect_ratio;
 -                    else
 -                        sar = ist->st->codec->sample_aspect_ratio;
 +                    if (!picture.sample_aspect_ratio.num)
 +                        picture.sample_aspect_ratio = ist->st->sample_aspect_ratio;
 +                    picture.pts = ist->pts;
                      // add it to be filtered
 -                    av_vsrc_buffer_add_frame(ost->input_video_filter, &picture,
 -                                             ist->pts,
 -                                             sar);
 +                    av_vsrc_buffer_add_frame2(ost->input_video_filter, &picture, ""); //TODO user setable params
                  }
              }
          }
@@@ -3537,8 -3365,9 +3536,8 @@@ static void new_video_stream(AVFormatCo
          ost->frame_aspect_ratio = frame_aspect_ratio;
          frame_aspect_ratio = 0;
  #if CONFIG_AVFILTER
--        ost->avfilter= vfilters;
-         vfilters= NULL;
++        ost->avfilter = vfilters;
+         vfilters = NULL;
  #endif
      }
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge