aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2011-09-09 00:16:17 -0300
committerStefano Sabatini <stefasab@gmail.com>2011-09-16 11:16:05 +0200
commit215e197942e33d5c5749d786e938bf7abe856c1d (patch)
tree69916b1251188c7d4f7710deb3bc2cf45a604bc2 /libavdevice
parentdd41036a4c39252115b2f22b50d4681fb872369a (diff)
downloadffmpeg-215e197942e33d5c5749d786e938bf7abe856c1d.tar.gz
dshow: invert condition to avoid leaking objects
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Diffstat (limited to 'libavdevice')
-rw-r--r--libavdevice/dshow.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
index 5f155e686e..8dc9df998e 100644
--- a/libavdevice/dshow.c
+++ b/libavdevice/dshow.c
@@ -261,7 +261,7 @@ dshow_cycle_devices(AVFormatContext *avctx, ICreateDevEnum *devenum,
return AVERROR(EIO);
}
- while (IEnumMoniker_Next(classenum, 1, &m, NULL) == S_OK && !device_filter) {
+ while (!device_filter && IEnumMoniker_Next(classenum, 1, &m, NULL) == S_OK) {
IPropertyBag *bag = NULL;
char *buf = NULL;
VARIANT var;
@@ -469,7 +469,7 @@ dshow_cycle_pins(AVFormatContext *avctx, enum dshowDeviceType devtype,
av_log(avctx, AV_LOG_INFO, "DirectShow %s device options\n",
devtypename);
}
- while (IEnumPins_Next(pins, 1, &pin, NULL) == S_OK && !device_pin) {
+ while (!device_pin && IEnumPins_Next(pins, 1, &pin, NULL) == S_OK) {
IKsPropertySet *p = NULL;
IEnumMediaTypes *types = NULL;
PIN_INFO info = {0};
@@ -508,7 +508,7 @@ dshow_cycle_pins(AVFormatContext *avctx, enum dshowDeviceType devtype,
goto next;
IEnumMediaTypes_Reset(types);
- while (IEnumMediaTypes_Next(types, 1, &type, NULL) == S_OK && !device_pin) {
+ while (!device_pin && IEnumMediaTypes_Next(types, 1, &type, NULL) == S_OK) {
if (IsEqualGUID(&type->majortype, mediatype[devtype])) {
device_pin = pin;
goto next;