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)
* qatar/master:
  Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents

Conflicts:
libavcodec/g2meet.c

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

Simple merge