aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/dither.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-07 21:45:52 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-07 21:45:52 +0200
commit67732b9d62576c67589773e5332e94aac429cc4c (patch)
treebb7e865164fd3ed8365be014d3b1bf420d347ff0 /libswresample/dither.c
parentb4d44367bc45b7bafd61c4bf59434bc517a6a440 (diff)
parenta8656cd425babe6a2fe12aff826de57f28b8efcd (diff)
downloadffmpeg-67732b9d62576c67589773e5332e94aac429cc4c.tar.gz
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>
Diffstat (limited to 'libswresample/dither.c')
0 files changed, 0 insertions, 0 deletions