Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Jun 2012 20:44:18 +0000 (22:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Jun 2012 20:44:18 +0000 (22:44 +0200)
* qatar/master:
  dsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section.
  dnxhdenc: add space between function argument type and comment.
  x86: fmtconvert: add special asm for float_to_int16_interleave_misc_*
  attributes: Add a definition of av_always_inline for MSVC
  cmdutils: Pass the actual chosen encoder to filter_codec_opts
  os_support: Add fallback definitions for stat flags
  os_support: Rename the poll fallback function to ff_poll
  network: Check for struct pollfd
  os_support: Don't compare a negative number against socket descriptors
  os_support: Include all the necessary headers for the win32 open function
  x86: vc1: fix and enable optimised loop filter

Conflicts:
cmdutils.c
cmdutils.h
ffmpeg.c
ffplay.c
libavformat/os_support.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
1  2 
cmdutils.c
cmdutils.h
configure
ffmpeg.c
ffplay.c
libavcodec/dnxhdenc.h
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fmtconvert.asm
libavcodec/x86/fmtconvert_mmx.c
libavcodec/x86/vc1dsp_mmx.c
libavcodec/x86/vc1dsp_yasm.asm
libavformat/os_support.c
libavformat/os_support.h
libavutil/attributes.h

diff --cc cmdutils.c
Simple merge
diff --cc cmdutils.h
Simple merge
diff --cc configure
Simple merge
diff --cc ffmpeg.c
+++ b/ffmpeg.c
@@@ -4149,7 -3441,7 +4149,7 @@@ static void add_input_streams(OptionsCo
          ist->file_index = nb_input_files;
          ist->discard = 1;
          st->discard  = AVDISCARD_ALL;
-         ist->opts = filter_codec_opts(codec_opts, choose_decoder(o, ic, st), ic, st);
 -        ist->opts = filter_codec_opts(codec_opts, ist->st->codec->codec_id, ic, st, NULL);
++        ist->opts = filter_codec_opts(codec_opts, ist->st->codec->codec_id, ic, st, choose_decoder(o, ic, st));
  
          ist->ts_scale = 1.0;
          MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st);
diff --cc ffplay.c
+++ b/ffplay.c
@@@ -2160,24 -2081,12 +2160,24 @@@ static int stream_component_open(VideoS
          return -1;
      avctx = ic->streams[stream_index]->codec;
  
 -    opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index], NULL);
 -
      codec = avcodec_find_decoder(avctx->codec_id);
-     opts = filter_codec_opts(codec_opts, codec, ic, ic->streams[stream_index]);
 -    avctx->debug_mv          = debug_mv;
 -    avctx->debug             = debug;
++    opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index], codec);
 +
 +    switch(avctx->codec_type){
 +        case AVMEDIA_TYPE_AUDIO   : is->last_audio_stream    = stream_index; if(audio_codec_name   ) codec= avcodec_find_decoder_by_name(   audio_codec_name); break;
 +        case AVMEDIA_TYPE_SUBTITLE: is->last_subtitle_stream = stream_index; if(subtitle_codec_name) codec= avcodec_find_decoder_by_name(subtitle_codec_name); break;
 +        case AVMEDIA_TYPE_VIDEO   : is->last_video_stream    = stream_index; if(video_codec_name   ) codec= avcodec_find_decoder_by_name(   video_codec_name); break;
 +    }
 +    if (!codec)
 +        return -1;
 +
      avctx->workaround_bugs   = workaround_bugs;
 +    avctx->lowres            = lowres;
 +    if(avctx->lowres > codec->max_lowres){
 +        av_log(avctx, AV_LOG_WARNING, "The maximum value for lowres supported by the decoder is %d\n",
 +                codec->max_lowres);
 +        avctx->lowres= codec->max_lowres;
 +    }
      avctx->idct_algo         = idct;
      avctx->skip_frame        = skip_frame;
      avctx->skip_idct         = skip_idct;
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -808,10 -795,14 +808,10 @@@ void ff_vc1dsp_init_mmx(VC1DSPContext *
  
  #if HAVE_YASM
      if (mm_flags & AV_CPU_FLAG_MMX) {
 -        dsp->put_no_rnd_vc1_chroma_pixels_tab[0]= ff_put_vc1_chroma_mc8_mmx_nornd;
      }
-     return;
      if (mm_flags & AV_CPU_FLAG_MMX2) {
          ASSIGN_LF(mmx2);
 -        dsp->avg_no_rnd_vc1_chroma_pixels_tab[0]= ff_avg_vc1_chroma_mc8_mmx2_nornd;
 -    } else if (mm_flags & AV_CPU_FLAG_3DNOW) {
 -        dsp->avg_no_rnd_vc1_chroma_pixels_tab[0]= ff_avg_vc1_chroma_mc8_3dnow_nornd;
      }
  
      if (mm_flags & AV_CPU_FLAG_SSE2) {
Simple merge
  #include "os_support.h"
  
  #if defined(_WIN32) && !defined(__MINGW32CE__)
+ #undef open
+ #include <fcntl.h>
+ #include <io.h>
  #include <windows.h>
 +#include <share.h>
  
- #undef open
  int ff_win32_open(const char *filename_utf8, int oflag, int pmode)
  {
      int fd;
  
  #include "config.h"
  
+ #include <sys/stat.h>
  #if defined(__MINGW32__) && !defined(__MINGW32CE__)
  #  include <fcntl.h>
 +#  ifdef lseek
 +#   undef lseek
 +#  endif
  #  define lseek(f,p,w) _lseeki64((f), (p), (w))
  #  define stat _stati64
  #  define fstat(f,s) _fstati64((f), (s))
Simple merge