Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Aug 2012 20:17:02 +0000 (22:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Aug 2012 20:17:02 +0000 (22:17 +0200)
* qatar/master:
  x86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2
  rational: add av_inv_q() returning the inverse of an AVRational
  dpx: Make start offset unsigned
  lavfi: properly signal out-of-memory error in ff_filter_samples
  cosmetics: Fix a few switched periods and linebreaks
  zerocodec: Fix memleak in decode_frame
  zerocodec: Cosmetics

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
ffmpeg.c
libavcodec/dpx.c
libavcodec/x86/h264_idct.asm
libavfilter/audio.c
libavutil/rational.h

diff --cc ffmpeg.c
+++ b/ffmpeg.c
@@@ -1172,14 -797,10 +1172,13 @@@ static int configure_input_video_filter
      AVFilterContext *first_filter = in->filter_ctx;
      AVFilter *filter = avfilter_get_by_name("buffer");
      InputStream *ist = ifilter->ist;
-     AVRational tb = ist->framerate.num ? (AVRational){ist->framerate.den,
-                                                       ist->framerate.num} :
+     AVRational tb = ist->framerate.num ? av_inv_q(ist->framerate) :
                                           ist->st->time_base;
 +    AVRational fr = ist->framerate.num ? ist->framerate :
 +                                         ist->st->r_frame_rate;
      AVRational sar;
 -    char args[255], name[255];
 +    AVBPrint args;
 +    char name[255];
      int pad_idx = in->pad_idx;
      int ret;
  
Simple merge
Simple merge
Simple merge
Simple merge