Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jan 2013 12:54:38 +0000 (13:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jan 2013 12:54:38 +0000 (13:54 +0100)
commit8ac0d95bd371a3cf6b4dd57a3d56cdc7bceef464
tree1cbdc131646a523249ebdd373387176c161e5928
parent17596198cacbb7277f1d9641f0a76fe62ebf155d
parent940b8b5861241df7aff8977774e1de6e67de5b83
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: avoid pointless copying of ref lists
  lavr: always reset mix function names and pointers in mix_function_init()
  lavr: call mix_function_init() in ff_audio_mix_set_matrix()
  fate: update ref after rv30_loop_filter fix
  rv30: fix masking in rv30_loop_filter()

Conflicts:
tests/ref/fate/filter-delogo
tests/ref/fate/rv30

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/rv30.c
tests/ref/fate/filter-delogo
tests/ref/fate/rv30