1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavcodec
Michael Niedermayer 857d7194ca Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h264: add a pointer for weighted prediction temporary buffer

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-07 16:29:07 +01:00
..
2012-11-26 11:17:17 -05:00
2012-12-06 19:09:48 +00:00
2012-11-30 15:00:35 +00:00
2012-12-05 19:31:27 +01:00
2012-11-25 18:38:12 +01:00
2012-11-28 16:21:25 +00:00
2012-12-07 15:19:49 +00:00