• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · edae3dbf
    Michael Niedermayer authored
    * qatar/master: (23 commits)
      h264: hide reference frame errors unless requested
      swscale: split hScale() function pointer into h[cy]Scale().
      Move clipd macros to x86util.asm.
      avconv: reindent.
      avconv: rescue poor abused start_time global.
      avconv: rescue poor abused recording_time global.
      avconv: merge two loops in output_packet().
      avconv: fix broken indentation.
      avconv: get rid of the arbitrary MAX_FILES limit.
      avconv: get rid of the output_streams_for_file vs. ost_table schizophrenia
      avconv: add a wrapper for output AVFormatContexts and merge output_opts into it
      avconv: make itsscale syntax consistent with other options.
      avconv: factor out adding input streams.
      avconv: Factorize combining auto vsync with format.
      avconv: Factorize video resampling.
      avconv: Don't unnecessarily convert ipts to a double.
      ffmpeg: remove unsed variable nopts
      RV3/4 parser: remove unused variable 'off'
      add XMV demuxer
      rmdec: parse FPS in RealMedia properly
      ...
    
    Conflicts:
    	avconv.c
    	libavformat/version.h
    	libswscale/swscale.c
    	tests/ref/fate/lmlm4-demux
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    edae3dbf
Makefile 18.6 KB