Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 10:03:12 +0000 (12:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 10:03:12 +0000 (12:03 +0200)
commit000f8bcd0360b7c81ed62e89e335a48777ab44c0
treed584956e9ad00dac142ee0a54665d6b951101377
parent870f506cfeec6338be77d945ebecc4cfd75353aa
parent78b4bfdb84b7c909f7b97c87de17f59e36c50559
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents

Conflicts:
libavcodec/g2meet.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/g2meet.c