Accepting request 680556 from home:iznogood:branches:multimedia:libs

- Drop ffmpeg-libcdio_cdda-pkgconfig.patch: It only adds comments
  in it's current form, so serves no purpose at all anymore.
- Refresh patches with refresh_patches service.
- Rename rpmlintrc file to ffmpeg-4-rpmlintrc.
- Add missing conditional configure option: --enable-libbs2b,
  BuildRequires already in place.

OBS-URL: https://build.opensuse.org/request/show/680556
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=48

ffmpeg-4.spec

@@ -110,11 +110,10 @@ Url:            https://ffmpeg.org/
 #Git-Clone:     git://source.ffmpeg.org/ffmpeg
 Source:         https://www.ffmpeg.org/releases/%_name-%version.tar.xz
 Source2:        https://www.ffmpeg.org/releases/%_name-%version.tar.xz.asc
-Source3:        ffmpeg-rpmlintrc
+Source3:        ffmpeg-4-rpmlintrc
 Source4:        enable_decoders
 Source5:        enable_encoders
 Source99:       baselibs.conf
-Patch1:         ffmpeg-libcdio_cdda-pkgconfig.patch
 Patch2:         ffmpeg-arm6l.diff
 Patch3:         ffmpeg-new-coder-errors.diff
 Patch4:         ffmpeg-codec-choice.diff
@@ -598,6 +597,9 @@ CFLAGS="%optflags" \
 %endif
 	--enable-libass \
 	--enable-libbluray \
+%if %{with bs2b}
+	--enable-libbs2b \
+%endif
 	--enable-libcelt \
 	--enable-libcdio \
 %if %{with codec2}