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)
commit5c2fc3bdd7f6da1c12f731419cd60037e9c3c2a4
tree1a966b26141c8815e0ae89153ce8d4c828d51728
parent14f79ba18f263a746f91dbd80f4d109fb16105ca
parentea061af15ac5629dc8dbeb33b7382d6711a323c3
Merge remote-tracking branch 'qatar/master'

* 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>
configure
libavcodec/h264_direct.c