diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-29 22:09:31 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-29 22:09:31 +0200 |
| commit | 5132756f09c7a0dafe4644db92718ee3d1a58d6c (patch) | |
| tree | 094343cedcd9fe8bacb3380e98d96e952b7115ea /src/dabInputMpegFile.cpp | |
| parent | 5c3c6d734ff0c57fd3d45746df23b96e0e7fc99e (diff) | |
| parent | e7ad2e1fab9c51189fdc8b4f2d81f625da9dd422 (diff) | |
| download | dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.tar.gz dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.tar.bz2 dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.zip | |
Merge branch 'next' into servicelinking
Diffstat (limited to 'src/dabInputMpegFile.cpp')
| -rw-r--r-- | src/dabInputMpegFile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dabInputMpegFile.cpp b/src/dabInputMpegFile.cpp index 724ad54..804ea29 100644 --- a/src/dabInputMpegFile.cpp +++ b/src/dabInputMpegFile.cpp @@ -37,8 +37,8 @@ struct dabInputOperations dabInputMpegFileOperations = { dabInputFileOpen, dabInputSetbuf, dabInputFileRead, - NULL, - NULL, + nullptr, + nullptr, dabInputMpegFileRead, dabInputMpegSetbitrate, dabInputFileClose, |