Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Dec 2012 14:00:05 +0000 (15:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Dec 2012 14:00:05 +0000 (15:00 +0100)
* qatar/master:
  configure: formatting cosmetics
  h264: use mbaff ref indices in fill_colmap() only for mbaff references

Conflicts:
libavcodec/h264_direct.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/h264_direct.c

diff --cc configure
Simple merge
Simple merge