Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Jun 2012 19:45:52 +0000 (21:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Jun 2012 19:45:52 +0000 (21:45 +0200)
commit67732b9d62576c67589773e5332e94aac429cc4c
treebb7e865164fd3ed8365be014d3b1bf420d347ff0
parentb4d44367bc45b7bafd61c4bf59434bc517a6a440
parenta8656cd425babe6a2fe12aff826de57f28b8efcd
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegts: Remove disabled extension matching probe.
  fate: avoid freopen(NULL) in videogen/rotozoom

Conflicts:
tests/rotozoom.c
tests/videogen.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpegts.c
tests/Makefile
tests/rotozoom.c
tests/videogen.c