Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867' | Michael Niedermayer | 2014-08-15 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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> | ||
| * | cosmetics: Write NULL pointer inequality checks more compactly | Gabriel Dume | 2014-08-15 |
| | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de> | ||
* | | Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef' | Michael Niedermayer | 2013-06-17 |
|/ | | | | | | | | | | * commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef': avf: move url utility functions in a separate file Conflicts: libavformat/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||
* | avf: move url utility functions in a separate file | Luca Barbato | 2013-06-16 |