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 /tools | |
| parent | fb33bff990a8327f59d4c7c509bba1f62bbd6c5a (diff) | |
| parent | 4b1f5e5090abed6c618c8ba380cd7d28d140f867 (diff) | |
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 'tools')
| -rw-r--r-- | tools/ismindex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/ismindex.c b/tools/ismindex.c index 57a909e9b0..ed9280e5d6 100644 --- a/tools/ismindex.c +++ b/tools/ismindex.c @@ -329,7 +329,7 @@ static int handle_file(struct Tracks *tracks, const char *file, int split, tracks->tracks[tracks->nb_tracks] = track; track->name = file; - if ((ptr = strrchr(file, '/')) != NULL) + if ((ptr = strrchr(file, '/'))) track->name = ptr + 1; track->bitrate = st->codec->bit_rate; |