[FFmpeg-cvslog] Merge commit '5e71299758d3aa7c93c3cca618a8e048a9483794'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 21 15:48:25 2017 -0300| [f02bda3a03c1103a1c293ad030e6bcf089b21902] | committer: James Almer

Merge commit '5e71299758d3aa7c93c3cca618a8e048a9483794'

* commit '5e71299758d3aa7c93c3cca618a8e048a9483794':
  lavf: Drop deprecated bitexact functionality

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f02bda3a03c1103a1c293ad030e6bcf089b21902
---

 libavformat/mux.c     | 9 ---------
 libavformat/version.h | 3 ---
 2 files changed, 12 deletions(-)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index 53ad46df42..c7711e8ae0 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -255,19 +255,10 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options)
 FF_DISABLE_DEPRECATION_WARNINGS
     if (s->nb_streams && s->streams[0]->codec->flags & AV_CODEC_FLAG_BITEXACT) {
         if (!(s->flags & AVFMT_FLAG_BITEXACT)) {
-#if FF_API_LAVF_BITEXACT
-            av_log(s, AV_LOG_WARNING,
-                   "Setting the AVFormatContext to bitexact mode, because "
-                   "the AVCodecContext is in that mode. This behavior will "
-                   "change in the future. To keep the current behavior, set "
-                   "AVFormatContext.flags |= AVFMT_FLAG_BITEXACT.\n");
-            s->flags |= AVFMT_FLAG_BITEXACT;
-#else
             av_log(s, AV_LOG_WARNING,
                    "The AVFormatContext is not in set to bitexact mode, only "
                    "the AVCodecContext. If this is not intended, set "
                    "AVFormatContext.flags |= AVFMT_FLAG_BITEXACT.\n");
-#endif
         }
     }
 FF_ENABLE_DEPRECATION_WARNINGS
diff --git a/libavformat/version.h b/libavformat/version.h
index ed0439a26a..262cd35fe0 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -55,9 +55,6 @@
  * at once through the bump. This improves the git bisect-ability of the change.
  *
  */
-#ifndef FF_API_LAVF_BITEXACT
-#define FF_API_LAVF_BITEXACT            (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_LAVF_FRAC
 #define FF_API_LAVF_FRAC                (LIBAVFORMAT_VERSION_MAJOR < 58)
 #endif


======================================================================

diff --cc libavformat/mux.c
index 53ad46df42,dfda89d983..c7711e8ae0
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@@ -247,31 -98,6 +247,22 @@@ static int init_muxer(AVFormatContext *
  
      if ((ret = av_opt_set_dict(s, &tmp)) < 0)
          goto fail;
 +    if (s->priv_data && s->oformat->priv_class && *(const AVClass**)s->priv_data==s->oformat->priv_class &&
 +        (ret = av_opt_set_dict2(s->priv_data, &tmp, AV_OPT_SEARCH_CHILDREN)) < 0)
 +        goto fail;
 +
 +#if FF_API_LAVF_AVCTX
 +FF_DISABLE_DEPRECATION_WARNINGS
 +    if (s->nb_streams && s->streams[0]->codec->flags & AV_CODEC_FLAG_BITEXACT) {
 +        if (!(s->flags & AVFMT_FLAG_BITEXACT)) {
- #if FF_API_LAVF_BITEXACT
-             av_log(s, AV_LOG_WARNING,
-                    "Setting the AVFormatContext to bitexact mode, because "
-                    "the AVCodecContext is in that mode. This behavior will "
-                    "change in the future. To keep the current behavior, set "
-                    "AVFormatContext.flags |= AVFMT_FLAG_BITEXACT.\n");
-             s->flags |= AVFMT_FLAG_BITEXACT;
- #else
 +            av_log(s, AV_LOG_WARNING,
 +                   "The AVFormatContext is not in set to bitexact mode, only "
 +                   "the AVCodecContext. If this is not intended, set "
 +                   "AVFormatContext.flags |= AVFMT_FLAG_BITEXACT.\n");
- #endif
 +        }
 +    }
 +FF_ENABLE_DEPRECATION_WARNINGS
 +#endif
  
      // some sanity checks
      if (s->nb_streams == 0 && !(of->flags & AVFMT_NOSTREAMS)) {
diff --cc libavformat/version.h
index ed0439a26a,26f5c75991..262cd35fe0
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@@ -49,15 -47,7 +49,12 @@@
   * FF_API_* defines may be placed below to indicate public API that will be
   * dropped at a future version bump. The defines themselves are not part of
   * the public API and may change, break or disappear at any time.
 + *
 + * @note, when bumping the major version it is recommended to manually
 + * disable each FF_API_* in its own commit instead of disabling them all
 + * at once through the bump. This improves the git bisect-ability of the change.
 + *
   */
- #ifndef FF_API_LAVF_BITEXACT
- #define FF_API_LAVF_BITEXACT            (LIBAVFORMAT_VERSION_MAJOR < 58)
- #endif
  #ifndef FF_API_LAVF_FRAC
  #define FF_API_LAVF_FRAC                (LIBAVFORMAT_VERSION_MAJOR < 58)
  #endif