Merge branch 'master' into release/3.1

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

5 files changed, 18 insertions, 18 deletions

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index c881808dbe..876f1e3ee4 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -203,15 +203,15 @@
  *   avio_open2() or a custom one.
  * - Unless the format is of the AVFMT_NOSTREAMS type, at least one stream must
  *   be created with the avformat_new_stream() function. The caller should fill
- *   the @ref AVStream.codec "stream codec context" information, such as the
- *   codec @ref AVCodecContext.codec_type "type", @ref AVCodecContext.codec_id
+ *   the @ref AVStream.codecpar "stream codec parameters" information, such as the
+ *   codec @ref AVCodecParameters.codec_type "type", @ref AVCodecParameters.codec_id
  *   "id" and other parameters (e.g. width / height, the pixel or sample format,
  *   etc.) as known. The @ref AVStream.time_base "stream timebase" should
  *   be set to the timebase that the caller desires to use for this stream (note
  *   that the timebase actually used by the muxer can be different, as will be
  *   described later).
  * - It is advised to manually initialize only the relevant fields in
- *   AVCodecContext, rather than using @ref avcodec_copy_context() during
+ *   AVCodecParameters, rather than using @ref avcodec_parameters_copy() during
  *   remuxing: there is no guarantee that the codec context values remain valid
  *   for both input and output format contexts.
  * - The caller may fill in additional information, such as @ref
diff --git a/libavformat/dump.c b/libavformat/dump.c
index d86792d40a..cd14625f65 100644
--- a/libavformat/dump.c
+++ b/libavformat/dump.c
@@ -252,7 +252,6 @@ static void dump_replaygain(void *ctx, AVPacketSideData *sd)
 static void dump_stereo3d(void *ctx, AVPacketSideData *sd)
 {
     AVStereo3D *stereo;
-    const char *name;
 
     if (sd->size < sizeof(*stereo)) {
         av_log(ctx, AV_LOG_INFO, "invalid data");
diff --git a/libavformat/riff.c b/libavformat/riff.c
index f35fc7d686..913b42dae9 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -424,6 +424,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { AV_CODEC_ID_M101,         MKTAG('M', '1', '0', '1') },
     { AV_CODEC_ID_M101,         MKTAG('M', '1', '0', '2') },
     { AV_CODEC_ID_MAGICYUV,     MKTAG('M', 'A', 'G', 'Y') },
+    { AV_CODEC_ID_YLC,          MKTAG('Y', 'L', 'C', '0') },
 
     { AV_CODEC_ID_NONE,         0 }
 };
diff --git a/libavformat/rtpenc_vc2hq.c b/libavformat/rtpenc_vc2hq.c
index deda62183a..085204fa64 100644
--- a/libavformat/rtpenc_vc2hq.c
+++ b/libavformat/rtpenc_vc2hq.c
@@ -60,19 +60,19 @@ static void send_picture(AVFormatContext *ctx, const uint8_t *buf, int size, int
     second_field = interlaced && (pic_nr & 0x01);
 
     init_get_bits(&gc, buf, 8  * size);
-                    svq3_get_ue_golomb(&gc); /* wavelet_idx */
-    wavelet_depth = svq3_get_ue_golomb(&gc);
-                    svq3_get_ue_golomb(&gc); /* num_x */
-                    svq3_get_ue_golomb(&gc); /* num_y */
-    prefix_bytes  = svq3_get_ue_golomb(&gc);
-    size_scaler   = svq3_get_ue_golomb(&gc);
+                    get_interleaved_ue_golomb(&gc); /* wavelet_idx */
+    wavelet_depth = get_interleaved_ue_golomb(&gc);
+                    get_interleaved_ue_golomb(&gc); /* num_x */
+                    get_interleaved_ue_golomb(&gc); /* num_y */
+    prefix_bytes  = get_interleaved_ue_golomb(&gc);
+    size_scaler   = get_interleaved_ue_golomb(&gc);
     /* pass the quantization matrices */
-    svq3_get_ue_golomb(&gc);
+    get_interleaved_ue_golomb(&gc);
     for(lvl = 0; lvl < wavelet_depth; lvl++)
     {
-        svq3_get_ue_golomb(&gc);
-        svq3_get_ue_golomb(&gc);
-        svq3_get_ue_golomb(&gc);
+        get_interleaved_ue_golomb(&gc);
+        get_interleaved_ue_golomb(&gc);
+        get_interleaved_ue_golomb(&gc);
     }
 
     frag_len = (get_bits_count(&gc) + 7) / 8; /* length of transform parameters */
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 6f0d2c567d..21c80c1cb0 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -248,7 +248,7 @@ static int sdp_parse_rtpmap(AVFormatContext *s,
     AVCodecParameters *par = st->codecpar;
     char buf[256];
     int i;
-    AVCodec *c;
+    const AVCodecDescriptor *desc;
     const char *c_name;
 
     /* See if we can handle this kind of payload.
@@ -274,9 +274,9 @@ static int sdp_parse_rtpmap(AVFormatContext *s,
             par->codec_id = ff_rtp_codec_id(buf, par->codec_type);
     }
 
-    c = avcodec_find_decoder(par->codec_id);
-    if (c && c->name)
-        c_name = c->name;
+    desc = avcodec_descriptor_get(par->codec_id);
+    if (desc && desc->name)
+        c_name = desc->name;
     else
         c_name = "(null)";