Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Feb 2013 13:34:18 +0000 (14:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Feb 2013 13:34:18 +0000 (14:34 +0100)
* qatar/master:
  Use proper "" quotes for local header #includes
  ppc: fmtconvert: Drop two unused variables.
  bink demuxer: set framerate.

Conflicts:
libavcodec/kbdwin.c
libavcodec/ppc/fmtconvert_altivec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/arm/videodsp_init_armv5te.c
libavcodec/kbdwin.c
libavcodec/ppc/fmtconvert_altivec.c
libavformat/bink.c
libavformat/rtp.c

@@@ -16,9 -16,8 +16,8 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
- #include <libavutil/avassert.h>
- #include <libavutil/mathematics.h>
 -#include <assert.h>
++#include "libavutil/avassert.h"
+ #include "libavutil/mathematics.h"
  #include "libavutil/attributes.h"
  #include "kbdwin.h"
  
Simple merge
Simple merge
Simple merge