@@ -32,3 +32,4 @@

 /avversion.h

 /lcov/

 /src

+/mapfile

@@ -2,6 +2,10 @@ Entries are sorted chronologically from oldest to youngest within each release,

 releases are sorted from youngest to oldest.

 version <next>:

+- YUY2 Lossless Codec decoder

+

+

+version 3.1:

 - DXVA2-accelerated HEVC Main10 decoding

 - fieldhint filter

 - loop video filter and aloop audio filter

@@ -184,7 +184,7 @@ clean::

 distclean::

 	$(RM) $(DISTCLEANSUFFIXES)

-	$(RM) config.* .config libavutil/avconfig.h .version avversion.h version.h libavutil/ffversion.h libavcodec/codec_names.h libavcodec/bsf_list.c libavformat/protocol_list.c

+	$(RM) config.* .config libavutil/avconfig.h .version mapfile avversion.h version.h libavutil/ffversion.h libavcodec/codec_names.h libavcodec/bsf_list.c libavformat/protocol_list.c

 ifeq ($(SRC_LINK),src)

 	$(RM) src

 endif

@@ -5970,8 +5970,7 @@ enabled vdpau &&

     disable vdpau

 enabled vdpau && enabled xlib &&

-    check_func_headers "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau &&

-    prepend ffmpeg_libs $($ldflags_filter "-lvdpau") &&

+    check_lib2 "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau &&

     enable vdpau_x11

 # Funny iconv installations are not unusual, so check it after all flags have been set

@@ -15,6 +15,12 @@ libavutil:     2015-08-28

 API changes, most recent first:

+2016-06-26 - xxxxxxx / 1c9e861 - lavu 55.27.100 / 55.13.0 - hwcontext.h

+  Add av_hwdevice_ctx_create().

+

+2016-06-26 - xxxxxxx / e47b8bb - lavc 57.48.101 / 57.19.1 - avcodec.h

+  Adjust values for JPEG 2000 profiles.

+

 -------- 8< --------- FFmpeg 3.1 was cut here -------- 8< ---------

 2016-06-23 - 5d75e46 / db7968b - lavf 57.40.100 / 57.7.0 - avio.h

@@ -61,9 +61,6 @@ DEFINE_GUID(DXVA2_ModeVP9_VLD_Profile0, 0x463707f8, 0xa1d0,0x4585,0x87,0x6d,0x83

 DEFINE_GUID(DXVA2_NoEncrypt,          0x1b81beD0, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);

 DEFINE_GUID(GUID_NULL,                0x00000000, 0x0000,0x0000,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00);

-typedef IDirect3D9* WINAPI pDirect3DCreate9(UINT);

-typedef HRESULT WINAPI pCreateDeviceManager9(UINT *, IDirect3DDeviceManager9 **);

-

 typedef struct dxva2_mode {

   const GUID     *guid;

   enum AVCodecID codec;

@@ -96,16 +93,6 @@ static const dxva2_mode dxva2_modes[] = {

     { NULL,                      0 },

 };

-typedef struct DXVA2DevicePriv {

-    HMODULE d3dlib;

-    HMODULE dxva2lib;

-

-    HANDLE  deviceHandle;

-

-    IDirect3D9                  *d3d9;

-    IDirect3DDevice9            *d3d9device;

-} DXVA2DevicePriv;

-

 typedef struct DXVA2Context {

     IDirectXVideoDecoder        *decoder;

@@ -119,32 +106,6 @@ typedef struct DXVA2Context {

     AVBufferRef                 *hw_frames_ctx;

 } DXVA2Context;

-static void dxva2_device_uninit(AVHWDeviceContext *ctx)

-{

-    AVDXVA2DeviceContext *hwctx = ctx->hwctx;

-    DXVA2DevicePriv       *priv = ctx->user_opaque;

-

-    if (hwctx->devmgr && priv->deviceHandle != INVALID_HANDLE_VALUE)

-        IDirect3DDeviceManager9_CloseDeviceHandle(hwctx->devmgr, priv->deviceHandle);

-

-    if (hwctx->devmgr)

-        IDirect3DDeviceManager9_Release(hwctx->devmgr);

-

-    if (priv->d3d9device)

-        IDirect3DDevice9_Release(priv->d3d9device);

-

-    if (priv->d3d9)

-        IDirect3D9_Release(priv->d3d9);

-

-    if (priv->d3dlib)

-        FreeLibrary(priv->d3dlib);

-

-    if (priv->dxva2lib)

-        FreeLibrary(priv->dxva2lib);

-

-    av_freep(&ctx->user_opaque);

-}

-

 static void dxva2_uninit(AVCodecContext *s)

 {

     InputStream  *ist = s->opaque;

@@ -201,17 +162,11 @@ static int dxva2_alloc(AVCodecContext *s)

     InputStream  *ist = s->opaque;

     int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE : AV_LOG_ERROR;

     DXVA2Context *ctx;

-    pDirect3DCreate9      *createD3D = NULL;

-    pCreateDeviceManager9 *createDeviceManager = NULL;

+    HANDLE device_handle;

     HRESULT hr;

-    D3DPRESENT_PARAMETERS d3dpp = {0};

-    D3DDISPLAYMODE        d3ddm;

-    unsigned resetToken = 0;

-    UINT adapter = D3DADAPTER_DEFAULT;

     AVHWDeviceContext    *device_ctx;

     AVDXVA2DeviceContext *device_hwctx;

-    DXVA2DevicePriv      *device_priv;

     int ret;

     ctx = av_mallocz(sizeof(*ctx));

@@ -223,102 +178,29 @@ static int dxva2_alloc(AVCodecContext *s)

     ist->hwaccel_get_buffer    = dxva2_get_buffer;

     ist->hwaccel_retrieve_data = dxva2_retrieve_data;

-    ctx->hw_device_ctx = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_DXVA2);

-    if (!ctx->hw_device_ctx)

+    ret = av_hwdevice_ctx_create(&ctx->hw_device_ctx, AV_HWDEVICE_TYPE_DXVA2,

+                                 ist->hwaccel_device, NULL, 0);

+    if (ret < 0)

         goto fail;

-

     device_ctx   = (AVHWDeviceContext*)ctx->hw_device_ctx->data;

     device_hwctx = device_ctx->hwctx;

-    device_priv = av_mallocz(sizeof(*device_priv));

-    if (!device_priv)

-        goto fail;

-

-    device_ctx->user_opaque = device_priv;

-    device_ctx->free        = dxva2_device_uninit;

-

-    device_priv->deviceHandle = INVALID_HANDLE_VALUE;

-

-    device_priv->d3dlib = LoadLibrary("d3d9.dll");

-    if (!device_priv->d3dlib) {

-        av_log(NULL, loglevel, "Failed to load D3D9 library\n");

-        goto fail;

-    }

-    device_priv->dxva2lib = LoadLibrary("dxva2.dll");

-    if (!device_priv->dxva2lib) {

-        av_log(NULL, loglevel, "Failed to load DXVA2 library\n");

-        goto fail;

-    }

-

-    createD3D = (pDirect3DCreate9 *)GetProcAddress(device_priv->d3dlib, "Direct3DCreate9");

-    if (!createD3D) {

-        av_log(NULL, loglevel, "Failed to locate Direct3DCreate9\n");

-        goto fail;

-    }

-    createDeviceManager = (pCreateDeviceManager9 *)GetProcAddress(device_priv->dxva2lib, "DXVA2CreateDirect3DDeviceManager9");

-    if (!createDeviceManager) {

-        av_log(NULL, loglevel, "Failed to locate DXVA2CreateDirect3DDeviceManager9\n");

-        goto fail;

-    }

-

-    device_priv->d3d9 = createD3D(D3D_SDK_VERSION);

-    if (!device_priv->d3d9) {

-        av_log(NULL, loglevel, "Failed to create IDirect3D object\n");

-        goto fail;

-    }

-

-    if (ist->hwaccel_device) {

-        adapter = atoi(ist->hwaccel_device);

-        av_log(NULL, AV_LOG_INFO, "Using HWAccel device %d\n", adapter);

-    }

-

-    IDirect3D9_GetAdapterDisplayMode(device_priv->d3d9, adapter, &d3ddm);

-    d3dpp.Windowed         = TRUE;

-    d3dpp.BackBufferWidth  = 640;

-    d3dpp.BackBufferHeight = 480;

-    d3dpp.BackBufferCount  = 0;

-    d3dpp.BackBufferFormat = d3ddm.Format;

-    d3dpp.SwapEffect       = D3DSWAPEFFECT_DISCARD;

-    d3dpp.Flags            = D3DPRESENTFLAG_VIDEO;

-

-    hr = IDirect3D9_CreateDevice(device_priv->d3d9, adapter, D3DDEVTYPE_HAL, GetDesktopWindow(),

-                                 D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_MULTITHREADED | D3DCREATE_FPU_PRESERVE,

-                                 &d3dpp, &device_priv->d3d9device);

-    if (FAILED(hr)) {

-        av_log(NULL, loglevel, "Failed to create Direct3D device\n");

-        goto fail;

-    }

-

-    hr = createDeviceManager(&resetToken, &device_hwctx->devmgr);

+    hr = IDirect3DDeviceManager9_OpenDeviceHandle(device_hwctx->devmgr,

+                                                  &device_handle);

     if (FAILED(hr)) {

-        av_log(NULL, loglevel, "Failed to create Direct3D device manager\n");

+        av_log(NULL, loglevel, "Failed to open a device handle\n");

         goto fail;

     }

-    hr = IDirect3DDeviceManager9_ResetDevice(device_hwctx->devmgr, device_priv->d3d9device, resetToken);

-    if (FAILED(hr)) {

-        av_log(NULL, loglevel, "Failed to bind Direct3D device to device manager\n");

-        goto fail;

-    }

-

-    hr = IDirect3DDeviceManager9_OpenDeviceHandle(device_hwctx->devmgr, &device_priv->deviceHandle);

-    if (FAILED(hr)) {

-        av_log(NULL, loglevel, "Failed to open device handle\n");

-        goto fail;

-    }

-

-    hr = IDirect3DDeviceManager9_GetVideoService(device_hwctx->devmgr, device_priv->deviceHandle, &IID_IDirectXVideoDecoderService, (void **)&ctx->decoder_service);

+    hr = IDirect3DDeviceManager9_GetVideoService(device_hwctx->devmgr, device_handle,

+                                                 &IID_IDirectXVideoDecoderService,

+                                                 (void **)&ctx->decoder_service);

+    IDirect3DDeviceManager9_CloseDeviceHandle(device_hwctx->devmgr, device_handle);

     if (FAILED(hr)) {

         av_log(NULL, loglevel, "Failed to create IDirectXVideoDecoderService\n");

         goto fail;

     }

-    ret = av_hwdevice_ctx_init(ctx->hw_device_ctx);

-    if (ret < 0) {

-        av_log(NULL, loglevel, "Failed to initialize the HW device context\n");

-        goto fail;

-    }

-

     ctx->tmp_frame = av_frame_alloc();

     if (!ctx->tmp_frame)

         goto fail;

@@ -523,102 +523,14 @@ fail:

 static AVClass *vaapi_log = &vaapi_class;

-static av_cold void vaapi_device_uninit(AVHWDeviceContext *hwdev)

-{

-    AVVAAPIDeviceContext *hwctx = hwdev->hwctx;

-    av_log(&vaapi_log, AV_LOG_VERBOSE, "Terminating VAAPI connection.\n");

-    vaTerminate(hwctx->display);

-}

-

 av_cold int vaapi_device_init(const char *device)

 {

-    AVHWDeviceContext    *hwdev;

-    AVVAAPIDeviceContext *hwctx;

-    VADisplay display;

-    VAStatus vas;

-    int major, minor, err;

-

-    display = 0;

-

-#if HAVE_VAAPI_X11

-    if (!display) {

-        Display *x11_display;

-

-        // Try to open the device as an X11 display.

-        x11_display = XOpenDisplay(device);

-        if (!x11_display) {

-            av_log(&vaapi_log, AV_LOG_WARNING, "Cannot open X11 display "

-                   "%s.\n", XDisplayName(device));

-        } else {

-            display = vaGetDisplay(x11_display);

-            if (!display) {

-                av_log(&vaapi_log, AV_LOG_WARNING, "Cannot open a VA display "

-                       "from X11 display %s.\n", XDisplayName(device));

-                XCloseDisplay(x11_display);

-            } else {

-                av_log(&vaapi_log, AV_LOG_VERBOSE, "Opened VA display via "

-                       "X11 display %s.\n", XDisplayName(device));

-            }

-        }

-    }

-#endif

-

-#if HAVE_VAAPI_DRM

-    if (!display && device) {

-        int drm_fd;

-

-        // Try to open the device as a DRM path.

-        drm_fd = open(device, O_RDWR);

-        if (drm_fd < 0) {

-            av_log(&vaapi_log, AV_LOG_WARNING, "Cannot open DRM device %s.\n",

-                   device);

-        } else {

-            display = vaGetDisplayDRM(drm_fd);

-            if (!display) {

-                av_log(&vaapi_log, AV_LOG_WARNING, "Cannot open a VA display "

-                       "from DRM device %s.\n", device);

-                close(drm_fd);

-            } else {

-                av_log(&vaapi_log, AV_LOG_VERBOSE, "Opened VA display via "

-                       "DRM device %s.\n", device);

-            }

-        }

-    }

-#endif

-

-    if (!display) {

-        av_log(&vaapi_log, AV_LOG_ERROR, "No VA display found for "

-               "device %s.\n", device);

-        return AVERROR(EINVAL);

-    }

-

-    vas = vaInitialize(display, &major, &minor);

-    if (vas != VA_STATUS_SUCCESS) {

-        av_log(&vaapi_log, AV_LOG_ERROR, "Failed to initialise VAAPI "

-               "connection: %d (%s).\n", vas, vaErrorStr(vas));

-        return AVERROR(EIO);

-    }

-    av_log(&vaapi_log, AV_LOG_VERBOSE, "Initialised VAAPI connection: "

-           "version %d.%d\n", major, minor);

-

-    hw_device_ctx = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VAAPI);

-    if (!hw_device_ctx) {

-        av_log(&vaapi_log, AV_LOG_ERROR, "Failed to create VAAPI "

-               "hardware context.\n");

-        vaTerminate(display);

-        return AVERROR(ENOMEM);

-    }

-

-    hwdev = (AVHWDeviceContext*)hw_device_ctx->data;

-    hwdev->free = &vaapi_device_uninit;

-

-    hwctx = hwdev->hwctx;

-    hwctx->display = display;

+    int err;

-    err = av_hwdevice_ctx_init(hw_device_ctx);

+    err = av_hwdevice_ctx_create(&hw_device_ctx, AV_HWDEVICE_TYPE_VAAPI,

+                                 device, NULL, 0);

     if (err < 0) {

-        av_log(&vaapi_log, AV_LOG_ERROR, "Failed to initialise VAAPI "

-               "hardware context: %d\n", err);

+        av_log(&vaapi_log, AV_LOG_ERROR, "Failed to create a VAAPI device\n");

         return err;

     }

@@ -18,11 +18,6 @@

 #include <stdint.h>

-#include <vdpau/vdpau.h>

-#include <vdpau/vdpau_x11.h>

-

-#include <X11/Xlib.h>

-

 #include "ffmpeg.h"

 #include "libavcodec/vdpau.h"

@@ -38,23 +33,6 @@ typedef struct VDPAUContext {

     AVFrame *tmp_frame;

 } VDPAUContext;

-typedef struct VDPAUHWDevicePriv {

-    VdpDeviceDestroy *device_destroy;

-    Display *dpy;

-} VDPAUHWDevicePriv;

-

-static void device_free(AVHWDeviceContext *ctx)

-{

-    AVVDPAUDeviceContext *hwctx = ctx->hwctx;

-    VDPAUHWDevicePriv     *priv = ctx->user_opaque;

-

-    if (priv->device_destroy)

-        priv->device_destroy(hwctx->device);

-    if (priv->dpy)

-        XCloseDisplay(priv->dpy);

-    av_freep(&priv);

-}

-

 static void vdpau_uninit(AVCodecContext *s)

 {

     InputStream  *ist = s->opaque;

@@ -106,15 +84,8 @@ static int vdpau_alloc(AVCodecContext *s)

     InputStream  *ist = s->opaque;

     int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE : AV_LOG_ERROR;

     VDPAUContext *ctx;

-    const char *display, *vendor;

-    VdpStatus err;

     int ret;

-    VdpDevice                device;

-    VdpGetProcAddress       *get_proc_address;

-    VdpGetInformationString *get_information_string;

-

-    VDPAUHWDevicePriv    *device_priv = NULL;

     AVBufferRef          *device_ref = NULL;

     AVHWDeviceContext    *device_ctx;

     AVVDPAUDeviceContext *device_hwctx;

@@ -124,12 +95,6 @@ static int vdpau_alloc(AVCodecContext *s)

     if (!ctx)

         return AVERROR(ENOMEM);

-    device_priv = av_mallocz(sizeof(*device_priv));

-    if (!device_priv) {

-        av_freep(&ctx);

-        goto fail;

-    }

-

     ist->hwaccel_ctx           = ctx;

     ist->hwaccel_uninit        = vdpau_uninit;

     ist->hwaccel_get_buffer    = vdpau_get_buffer;

@@ -139,51 +104,12 @@ static int vdpau_alloc(AVCodecContext *s)

     if (!ctx->tmp_frame)

         goto fail;

-    device_priv->dpy = XOpenDisplay(ist->hwaccel_device);

-    if (!device_priv->dpy) {

-        av_log(NULL, loglevel, "Cannot open the X11 display %s.\n",

-               XDisplayName(ist->hwaccel_device));

-        goto fail;

-    }

-    display = XDisplayString(device_priv->dpy);

-

-    err = vdp_device_create_x11(device_priv->dpy, XDefaultScreen(device_priv->dpy),

-                                &device, &get_proc_address);

-    if (err != VDP_STATUS_OK) {

-        av_log(NULL, loglevel, "VDPAU device creation on X11 display %s failed.\n",

-               display);

-        goto fail;

-    }

-

-#define GET_CALLBACK(id, result)                                                \

-do {                                                                            \

-    void *tmp;                                                                  \

-    err = get_proc_address(device, id, &tmp);                                   \

-    if (err != VDP_STATUS_OK) {                                                 \

-        av_log(NULL, loglevel, "Error getting the " #id " callback.\n");        \

-        goto fail;                                                              \

-    }                                                                           \

-    result = tmp;                                                               \

-} while (0)

-

-    GET_CALLBACK(VDP_FUNC_ID_GET_INFORMATION_STRING, get_information_string);

-    GET_CALLBACK(VDP_FUNC_ID_DEVICE_DESTROY,         device_priv->device_destroy);

-

-    device_ref = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VDPAU);

-    if (!device_ref)

-        goto fail;

-    device_ctx                     = (AVHWDeviceContext*)device_ref->data;

-    device_hwctx                   = device_ctx->hwctx;

-    device_ctx->user_opaque        = device_priv;

-    device_ctx->free               = device_free;

-    device_hwctx->device           = device;

-    device_hwctx->get_proc_address = get_proc_address;

-

-    device_priv = NULL;

-

-    ret = av_hwdevice_ctx_init(device_ref);

+    ret = av_hwdevice_ctx_create(&device_ref, AV_HWDEVICE_TYPE_VDPAU,

+                                 ist->hwaccel_device, NULL, 0);

     if (ret < 0)

         goto fail;

+    device_ctx   = (AVHWDeviceContext*)device_ref->data;

+    device_hwctx = device_ctx->hwctx;

     ctx->hw_frames_ctx = av_hwframe_ctx_alloc(device_ref);

     if (!ctx->hw_frames_ctx)

@@ -200,26 +126,17 @@ do {

     if (ret < 0)

         goto fail;

-    if (av_vdpau_bind_context(s, device, get_proc_address, 0))

+    if (av_vdpau_bind_context(s, device_hwctx->device, device_hwctx->get_proc_address, 0))

         goto fail;

-    get_information_string(&vendor);

-    av_log(NULL, AV_LOG_VERBOSE, "Using VDPAU -- %s -- on X11 display %s, "

-           "to decode input stream #%d:%d.\n", vendor,

-           display, ist->file_index, ist->st->index);

+    av_log(NULL, AV_LOG_VERBOSE, "Using VDPAU to decode input stream #%d:%d.\n",

+           ist->file_index, ist->st->index);

     return 0;

 fail:

     av_log(NULL, loglevel, "VDPAU init failed for stream #%d:%d.\n",

            ist->file_index, ist->st->index);

-    if (device_priv) {

-        if (device_priv->device_destroy)

-            device_priv->device_destroy(device);

-        if (device_priv->dpy)

-            XCloseDisplay(device_priv->dpy);

-    }

-    av_freep(&device_priv);

     av_buffer_unref(&device_ref);

     vdpau_uninit(s);

     return AVERROR(EINVAL);

@@ -633,6 +633,7 @@ OBJS-$(CONFIG_XWD_DECODER)             += xwddec.o

 OBJS-$(CONFIG_XWD_ENCODER)             += xwdenc.o

 OBJS-$(CONFIG_Y41P_DECODER)            += y41pdec.o

 OBJS-$(CONFIG_Y41P_ENCODER)            += y41penc.o

+OBJS-$(CONFIG_YLC_DECODER)             += ylc.o

 OBJS-$(CONFIG_YOP_DECODER)             += yop.o

 OBJS-$(CONFIG_YUV4_DECODER)            += yuv4dec.o

 OBJS-$(CONFIG_YUV4_ENCODER)            += yuv4enc.o

@@ -370,6 +370,7 @@ void avcodec_register_all(void)

     REGISTER_DECODER(XL,                xl);

     REGISTER_ENCDEC (XWD,               xwd);

     REGISTER_ENCDEC (Y41P,              y41p);

+    REGISTER_DECODER(YLC,               ylc);

     REGISTER_DECODER(YOP,               yop);

     REGISTER_ENCDEC (YUV4,              yuv4);

     REGISTER_DECODER(ZERO12V,           zero12v);

@@ -408,6 +408,7 @@ enum AVCodecID {

     AV_CODEC_ID_M101,

     AV_CODEC_ID_MAGICYUV,

     AV_CODEC_ID_SHEERVIDEO,

+    AV_CODEC_ID_YLC,

     /* various PCM "codecs" */

     AV_CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs

@@ -3217,9 +3218,9 @@ typedef struct AVCodecContext {

 #define FF_PROFILE_MPEG4_SIMPLE_STUDIO             14

 #define FF_PROFILE_MPEG4_ADVANCED_SIMPLE           15

-#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0   0

-#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1   1

-#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION  2

+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0   1

+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1   2

+#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION  32768

 #define FF_PROFILE_JPEG2000_DCINEMA_2K              3

 #define FF_PROFILE_JPEG2000_DCINEMA_4K              4

@@ -4117,7 +4118,6 @@ void avcodec_register_all(void);

  *              important mainly for encoders, e.g. libx264).

  *

  * @return An AVCodecContext filled with default values or NULL on failure.

- * @see avcodec_get_context_defaults

  */

 AVCodecContext *avcodec_alloc_context3(const AVCodec *codec);

@@ -4127,16 +4127,14 @@ AVCodecContext *avcodec_alloc_context3(const AVCodec *codec);

  */

 void avcodec_free_context(AVCodecContext **avctx);

+#if FF_API_GET_CONTEXT_DEFAULTS

 /**

- * Set the fields of the given AVCodecContext to default values corresponding

- * to the given codec (defaults may be codec-dependent).

- *

- * Do not call this function if a non-NULL codec has been passed

- * to avcodec_alloc_context3() that allocated this AVCodecContext.

- * If codec is non-NULL, it is illegal to call avcodec_open2() with a

- * different codec on this AVCodecContext.

+ * @deprecated This function should not be used, as closing and opening a codec

+ * context multiple time is not supported. A new codec context should be

+ * allocated for each new use.

  */

 int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec);

+#endif

 /**

  * Get the AVClass for AVCodecContext. It can be used in combination with

@@ -4146,6 +4144,7 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec);

  */

 const AVClass *avcodec_get_class(void);

+#if FF_API_COPY_CONTEXT

 /**

  * Get the AVClass for AVFrame. It can be used in combination with

  * AV_OPT_SEARCH_FAKE_OBJ for examining options.

@@ -4172,8 +4171,16 @@ const AVClass *avcodec_get_subtitle_rect_class(void);

  *             avcodec_alloc_context3(NULL), but otherwise uninitialized

  * @param src source codec context

  * @return AVERROR() on error (e.g. memory allocation error), 0 on success

+ *

+ * @deprecated The semantics of this function are ill-defined and it should not

+ * be used. If you need to transfer the stream parameters from one codec context

+ * to another, use an intermediate AVCodecParameters instance and the

+ * avcodec_parameters_from_context() / avcodec_parameters_to_context()

+ * functions.

  */

+attribute_deprecated

 int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);

+#endif

 /**

  * Allocate a new AVCodecParameters and set its fields to default values

@@ -4246,9 +4253,8 @@ int avcodec_parameters_to_context(AVCodecContext *codec,

  * @param avctx The context to initialize.

  * @param codec The codec to open this context for. If a non-NULL codec has been

  *              previously passed to avcodec_alloc_context3() or

- *              avcodec_get_context_defaults3() for this context, then this

- *              parameter MUST be either NULL or equal to the previously passed

- *              codec.

+ *              for this context, then this parameter MUST be either NULL or

+ *              equal to the previously passed codec.

  * @param options A dictionary filled with AVCodecContext and codec-private options.

  *                On return this object will be filled with options that were not found.

  *

@@ -4263,9 +4269,13 @@ int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **op

  * (but not the AVCodecContext itself).

  *

  * Calling this function on an AVCodecContext that hasn't been opened will free

- * the codec-specific data allocated in avcodec_alloc_context3() /

- * avcodec_get_context_defaults3() with a non-NULL codec. Subsequent calls will

- * do nothing.

+ * the codec-specific data allocated in avcodec_alloc_context3() with a non-NULL

+ * codec. Subsequent calls will do nothing.

+ *

+ * @note Do not use this function. Use avcodec_free_context() to destroy a

+ * codec context (either open or closed). Opening and closing a codec context

+ * multiple times is not supported anymore -- use multiple codec contexts

+ * instead.

  */

 int avcodec_close(AVCodecContext *avctx);

@@ -1556,6 +1556,13 @@ static const AVCodecDescriptor codec_descriptors[] = {

         .long_name = NULL_IF_CONFIG_SMALL("BitJazz SheerVideo"),

         .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,

     },

+    {

+        .id        = AV_CODEC_ID_YLC,

+        .type      = AVMEDIA_TYPE_VIDEO,

+        .name      = "ylc",

+        .long_name = NULL_IF_CONFIG_SMALL("YUY2 Lossless Codec"),

+        .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,

+    },

     /* various PCM "codecs" */

     {

@@ -151,8 +151,8 @@ static int parse_source_parameters(AVDiracSeqHeader *dsh, GetBitContext *gb,

     /* [DIRAC_STD] 10.3.2 Frame size. frame_size(video_params) */

     /* [DIRAC_STD] custom_dimensions_flag */

     if (get_bits1(gb)) {

-        dsh->width  = svq3_get_ue_golomb(gb); /* [DIRAC_STD] FRAME_WIDTH  */

-        dsh->height = svq3_get_ue_golomb(gb); /* [DIRAC_STD] FRAME_HEIGHT */

+        dsh->width  = get_interleaved_ue_golomb(gb); /* [DIRAC_STD] FRAME_WIDTH  */

+        dsh->height = get_interleaved_ue_golomb(gb); /* [DIRAC_STD] FRAME_HEIGHT */

     }

     /* [DIRAC_STD] 10.3.3 Chroma Sampling Format.

@@ -160,7 +160,7 @@ static int parse_source_parameters(AVDiracSeqHeader *dsh, GetBitContext *gb,

     /* [DIRAC_STD] custom_chroma_format_flag */

     if (get_bits1(gb))

         /* [DIRAC_STD] CHROMA_FORMAT_INDEX */

-        dsh->chroma_format = svq3_get_ue_golomb(gb);

+        dsh->chroma_format = get_interleaved_ue_golomb(gb);

     if (dsh->chroma_format > 2U) {

         if (log_ctx)

             av_log(log_ctx, AV_LOG_ERROR, "Unknown chroma format %d\n",

@@ -172,22 +172,22 @@ static int parse_source_parameters(AVDiracSeqHeader *dsh, GetBitContext *gb,

     /* [DIRAC_STD] custom_scan_format_flag */

     if (get_bits1(gb))

         /* [DIRAC_STD] SOURCE_SAMPLING */

-        dsh->interlaced = svq3_get_ue_golomb(gb);

+        dsh->interlaced = get_interleaved_ue_golomb(gb);

     if (dsh->interlaced > 1U)

         return AVERROR_INVALIDDATA;

     /* [DIRAC_STD] 10.3.5 Frame Rate. frame_rate(video_params) */

     if (get_bits1(gb)) { /* [DIRAC_STD] custom_frame_rate_flag */

-        dsh->frame_rate_index = svq3_get_ue_golomb(gb);

+        dsh->frame_rate_index = get_interleaved_ue_golomb(gb);

         if (dsh->frame_rate_index > 10U)

             return AVERROR_INVALIDDATA;

         if (!dsh->frame_rate_index) {

             /* [DIRAC_STD] FRAME_RATE_NUMER */

-            frame_rate.num = svq3_get_ue_golomb(gb);

+            frame_rate.num = get_interleaved_ue_golomb(gb);

             /* [DIRAC_STD] FRAME_RATE_DENOM */

-            frame_rate.den = svq3_get_ue_golomb(gb);

+            frame_rate.den = get_interleaved_ue_golomb(gb);

         }

     }

     /* [DIRAC_STD] preset_frame_rate(video_params, index) */

@@ -204,14 +204,14 @@ static int parse_source_parameters(AVDiracSeqHeader *dsh, GetBitContext *gb,

      * pixel_aspect_ratio(video_params) */

     if (get_bits1(gb)) { /* [DIRAC_STD] custom_pixel_aspect_ratio_flag */

         /* [DIRAC_STD] index */

-        dsh->aspect_ratio_index = svq3_get_ue_golomb(gb);

+        dsh->aspect_ratio_index = get_interleaved_ue_golomb(gb);

         if (dsh->aspect_ratio_index > 6U)

             return AVERROR_INVALIDDATA;

         if (!dsh->aspect_ratio_index) {

-            dsh->sample_aspect_ratio.num = svq3_get_ue_golomb(gb);

-            dsh->sample_aspect_ratio.den = svq3_get_ue_golomb(gb);

+            dsh->sample_aspect_ratio.num = get_interleaved_ue_golomb(gb);

+            dsh->sample_aspect_ratio.den = get_interleaved_ue_golomb(gb);

         }

     }

     /* [DIRAC_STD] Take value from Table 10.4 Available preset pixel

@@ -223,13 +223,13 @@ static int parse_source_parameters(AVDiracSeqHeader *dsh, GetBitContext *gb,

     /* [DIRAC_STD] 10.3.7 Clean area. clean_area(video_params) */

     if (get_bits1(gb)) { /* [DIRAC_STD] custom_clean_area_flag */

         /* [DIRAC_STD] CLEAN_WIDTH */

-        dsh->clean_width = svq3_get_ue_golomb(gb);

+        dsh->clean_width = get_interleaved_ue_golomb(gb);

         /* [DIRAC_STD] CLEAN_HEIGHT */

-        dsh->clean_height = svq3_get_ue_golomb(gb);

+        dsh->clean_height = get_interleaved_ue_golomb(gb);

         /* [DIRAC_STD] CLEAN_LEFT_OFFSET */

-        dsh->clean_left_offset = svq3_get_ue_golomb(gb);

+        dsh->clean_left_offset = get_interleaved_ue_golomb(gb);

         /* [DIRAC_STD] CLEAN_RIGHT_OFFSET */

-        dsh->clean_right_offset = svq3_get_ue_golomb(gb);

+        dsh->clean_right_offset = get_interleaved_ue_golomb(gb);

     }

     /* [DIRAC_STD] 10.3.8 Signal range. signal_range(video_params)

@@ -237,17 +237,17 @@ static int parse_source_parameters(AVDiracSeqHeader *dsh, GetBitContext *gb,

      * AVCOL_RANGE_MPEG/JPEG values */

     if (get_bits1(gb)) { /* [DIRAC_STD] custom_signal_range_flag */

         /* [DIRAC_STD] index */

-        dsh->pixel_range_index = svq3_get_ue_golomb(gb);

+        dsh->pixel_range_index = get_interleaved_ue_golomb(gb);

         if (dsh->pixel_range_index > 4U)

             return AVERROR_INVALIDDATA;

         /* This assumes either fullrange or MPEG levels only */

         if (!dsh->pixel_range_index) {

-            luma_offset = svq3_get_ue_golomb(gb);

-            luma_depth  = av_log2(svq3_get_ue_golomb(gb)) + 1;

-            svq3_get_ue_golomb(gb); /* chroma offset    */

-            svq3_get_ue_golomb(gb); /* chroma excursion */

+            luma_offset = get_interleaved_ue_golomb(gb);

+            luma_depth  = av_log2(get_interleaved_ue_golomb(gb)) + 1;

+            get_interleaved_ue_golomb(gb); /* chroma offset    */

+            get_interleaved_ue_golomb(gb); /* chroma excursion */

             dsh->color_range = luma_offset ? AVCOL_RANGE_MPEG

                                            : AVCOL_RANGE_JPEG;

         }

@@ -279,7 +279,7 @@ static int parse_source_parameters(AVDiracSeqHeader *dsh, GetBitContext *gb,

     /* [DIRAC_STD] 10.3.9 Colour specification. colour_spec(video_params) */

     if (get_bits1(gb)) { /* [DIRAC_STD] custom_colour_spec_flag */

         /* [DIRAC_STD] index */

-        idx = dsh->color_spec_index = svq3_get_ue_golomb(gb);

+        idx = dsh->color_spec_index = get_interleaved_ue_golomb(gb);

         if (dsh->color_spec_index > 4U)

             return AVERROR_INVALIDDATA;

@@ -291,20 +291,20 @@ static int parse_source_parameters(AVDiracSeqHeader *dsh, GetBitContext *gb,

         if (!dsh->color_spec_index) {

             /* [DIRAC_STD] 10.3.9.1 Colour primaries */

             if (get_bits1(gb)) {

-                idx = svq3_get_ue_golomb(gb);

+                idx = get_interleaved_ue_golomb(gb);

                 if (idx < 3U)

                     dsh->color_primaries = dirac_primaries[idx];

             }

             /* [DIRAC_STD] 10.3.9.2 Colour matrix */

             if (get_bits1(gb)) {

-                idx = svq3_get_ue_golomb(gb);

+                idx = get_interleaved_ue_golomb(gb);

                 if (!idx)

                     dsh->colorspace = AVCOL_SPC_BT709;

                 else if (idx == 1)

                     dsh->colorspace = AVCOL_SPC_BT470BG;

             }

             /* [DIRAC_STD] 10.3.9.3 Transfer function */

-            if (get_bits1(gb) && !svq3_get_ue_golomb(gb))

+            if (get_bits1(gb) && !get_interleaved_ue_golomb(gb))

                 dsh->color_trc = AVCOL_TRC_BT709;

         }

     } else {

@@ -336,13 +336,13 @@ int av_dirac_parse_sequence_header(AVDiracSeqHeader **pdsh,

         goto fail;

     /* [DIRAC_SPEC] 10.1 Parse Parameters. parse_parameters() */

-    dsh->version.major = svq3_get_ue_golomb(&gb);

-    dsh->version.minor = svq3_get_ue_golomb(&gb);

-    dsh->profile   = svq3_get_ue_golomb(&gb);

-    dsh->level     = svq3_get_ue_golomb(&gb);

+    dsh->version.major = get_interleaved_ue_golomb(&gb);

+    dsh->version.minor = get_interleaved_ue_golomb(&gb);

+    dsh->profile   = get_interleaved_ue_golomb(&gb);

+    dsh->level     = get_interleaved_ue_golomb(&gb);

     /* [DIRAC_SPEC] sequence_header() -> base_video_format as defined in

      * 10.2 Base Video Format, table 10.1 Dirac predefined video formats */

-    video_format   = svq3_get_ue_golomb(&gb);

+    video_format = get_interleaved_ue_golomb(&gb);

     if (dsh->version.major < 2 && log_ctx)

         av_log(log_ctx, AV_LOG_WARNING, "Stream is old and may not work\n");

@@ -377,7 +377,7 @@ int av_dirac_parse_sequence_header(AVDiracSeqHeader **pdsh,

     /* [DIRAC_STD] picture_coding_mode shall be 0 for fields and 1 for frames

      * currently only used to signal field coding */

-    picture_coding_mode = svq3_get_ue_golomb(&gb);

+    picture_coding_mode = get_interleaved_ue_golomb(&gb);

     if (picture_coding_mode != 0) {

         if (log_ctx) {

             av_log(log_ctx, AV_LOG_ERROR, "Unsupported picture coding mode %d",

@@ -671,9 +671,9 @@ static void decode_component(DiracContext *s, int comp)

             align_get_bits(&s->gb);

             /* [DIRAC_STD] 13.4.2 subband() */

-            b->length = svq3_get_ue_golomb(&s->gb);

+            b->length = get_interleaved_ue_golomb(&s->gb);

             if (b->length) {

-                b->quant = svq3_get_ue_golomb(&s->gb);

+                b->quant = get_interleaved_ue_golomb(&s->gb);

                 align_get_bits(&s->gb);

                 b->coeff_data = s->gb.buffer + get_bits_count(&s->gb)/8;

                 b->length = FFMIN(b->length, FFMAX(get_bits_left(&s->gb)/8, 0));

@@ -1001,7 +1001,7 @@ static int dirac_unpack_prediction_parameters(DiracContext *s)

     align_get_bits(gb);

     /* [DIRAC_STD] 11.2.2 Block parameters. block_parameters() */

     /* Luma and Chroma are equal. 11.2.3 */

-    idx = svq3_get_ue_golomb(gb); /* [DIRAC_STD] index */

+    idx = get_interleaved_ue_golomb(gb); /* [DIRAC_STD] index */

     if (idx > 4) {

         av_log(s->avctx, AV_LOG_ERROR, "Block prediction index too high\n");

@@ -1009,10 +1009,10 @@ static int dirac_unpack_prediction_parameters(DiracContext *s)

     }

     if (idx == 0) {

-        s->plane[0].xblen = svq3_get_ue_golomb(gb);

-        s->plane[0].yblen = svq3_get_ue_golomb(gb);

-        s->plane[0].xbsep = svq3_get_ue_golomb(gb);

-        s->plane[0].ybsep = svq3_get_ue_golomb(gb);

+        s->plane[0].xblen = get_interleaved_ue_golomb(gb);

+        s->plane[0].yblen = get_interleaved_ue_golomb(gb);

+        s->plane[0].xbsep = get_interleaved_ue_golomb(gb);

+        s->plane[0].ybsep = get_interleaved_ue_golomb(gb);

     } else {

         /*[DIRAC_STD] preset_block_params(index). Table 11.1 */

         s->plane[0].xblen = default_blen[idx-1];

@@ -1046,7 +1046,7 @@ static int dirac_unpack_prediction_parameters(DiracContext *s)

     /*[DIRAC_STD] 11.2.5 Motion vector precision. motion_vector_precision()

       Read motion vector precision */

-    s->mv_precision = svq3_get_ue_golomb(gb);

+    s->mv_precision = get_interleaved_ue_golomb(gb);

     if (s->mv_precision > 3) {

         av_log(s->avctx, AV_LOG_ERROR, "MV precision finer than eighth-pel\n");

         return AVERROR_INVALIDDATA;

@@ -1066,7 +1066,7 @@ static int dirac_unpack_prediction_parameters(DiracContext *s)

             /* [DIRAC_STD] zoom_rotate_shear(gparams)

                zoom/rotation/shear parameters */

             if (get_bits1(gb)) {

-                s->globalmc[ref].zrs_exp   = svq3_get_ue_golomb(gb);

+                s->globalmc[ref].zrs_exp   = get_interleaved_ue_golomb(gb);

                 s->globalmc[ref].zrs[0][0] = dirac_get_se_golomb(gb);

                 s->globalmc[ref].zrs[0][1] = dirac_get_se_golomb(gb);

                 s->globalmc[ref].zrs[1][0] = dirac_get_se_golomb(gb);

@@ -1077,7 +1077,7 @@ static int dirac_unpack_prediction_parameters(DiracContext *s)

             }

             /* [DIRAC_STD] perspective(gparams) */