diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 21:21:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 21:26:12 +0200 |
| commit | 60dbed6067676d847157fe530b1caed06c77e2ab (patch) | |
| tree | 62d43c9dc8162c8c809cc689f599befb2fdc2bbe /libavcodec/utils.c | |
| parent | fb33bff990a8327f59d4c7c509bba1f62bbd6c5a (diff) | |
| parent | 4b1f5e5090abed6c618c8ba380cd7d28d140f867 (diff) | |
| download | ffmpeg-60dbed6067676d847157fe530b1caed06c77e2ab.tar.gz | |
Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'
* commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867':
cosmetics: Write NULL pointer inequality checks more compactly
Conflicts:
libavcodec/dvdsubdec.c
libavcodec/h263dec.c
libavcodec/libxvid.c
libavcodec/rv10.c
libavcodec/utils.c
libavformat/format.c
libavformat/matroskadec.c
libavformat/segment.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b3715a95de..6a40a032e8 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -643,7 +643,7 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic) FramePool *pool = s->internal->pool; int i; - if (pic->data[0] != NULL) { + if (pic->data[0]) { av_log(s, AV_LOG_ERROR, "pic->data[0]!=NULL in avcodec_default_get_buffer\n"); return -1; } |