aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2010-03-23 23:35:36 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2010-03-23 23:35:36 +0000
commit85f273c7ca7e0035054fa55f98bd06c551f518b0 (patch)
tree6c9ba2dada5691b7e41cd7c42e190edf95a0e541
parentf684f3c58a77a20f18b80f888d69c2bacb53ca9b (diff)
downloadffmpeg-85f273c7ca7e0035054fa55f98bd06c551f518b0.tar.gz
x11grab: AVFormatParameters are always passed from av_open_input_stream(),
there is no need to check for it. Originally committed as revision 22651 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavdevice/x11grab.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index 60993276f5..045b82306e 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -110,7 +110,7 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
return AVERROR(EIO);
}
- if (!ap || ap->width <= 0 || ap->height <= 0 || ap->time_base.den <= 0) {
+ if (ap->width <= 0 || ap->height <= 0 || ap->time_base.den <= 0) {
av_log(s1, AV_LOG_ERROR, "AVParameters don't have video size and/or rate. Use -s and -r.\n");
return AVERROR(EIO);
}