diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 23:21:14 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 23:26:12 +0400 |
commit | 60dbed6067676d847157fe530b1caed06c77e2ab (patch) | |
tree | 62d43c9dc8162c8c809cc689f599befb2fdc2bbe /ffserver.c | |
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 'ffserver.c')
0 files changed, 0 insertions, 0 deletions