[FFmpeg-cvslog] Merge commit 'a12d3188cbec15e22070e139fa5cc541da07e2c3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 22:08:19 2015 +0100| [d8151a7e944aea52d167571badc247c8d9972847] | committer: Michael Niedermayer

Merge commit 'a12d3188cbec15e22070e139fa5cc541da07e2c3'

* commit 'a12d3188cbec15e22070e139fa5cc541da07e2c3':
  h264: use a smaller struct for the ref lists

Conflicts:
	libavcodec/h264_direct.c
	libavcodec/h264_mb.c
	libavcodec/h264_picture.c
	libavcodec/h264_refs.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8151a7e944aea52d167571badc247c8d9972847
---