Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Improve suggested Emacs settings for our coding style.
  utvideo: Remove unused variable 'src_size'
  mov: free memory on header parsing failure
  mov: fix leaking memory with multiple drefs.
  swscale: clip before assigning tables in RGB output functions.
  swscale: fix off-by-one in second coefficient in bilinear filters.

Conflicts:
	libavformat/mov.c
	libswscale/output.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc doc/developer.texi
index 32d666a,a4fdf3a..0c05e70
--- 1/doc/developer.texi
--- 2/doc/developer.texi
+++ b/doc/developer.texi
@@@ -198,10 -226,16 +198,16 @@@ autocmd InsertEnter * match ForbiddenWh
  
  For Emacs, add these roughly equivalent lines to your @file{.emacs.d/init.el}:
  @example
- (setq c-default-style "k&r")
- (setq-default c-basic-offset 4)
- (setq-default indent-tabs-mode nil)
- (setq-default show-trailing-whitespace t)
 -(c-add-style "libav"
++(c-add-style "ffmpeg"
+              '("k&r"
+                (c-basic-offset . 4)
+                (indent-tabs-mode nil)
+                (show-trailing-whitespace t)
+                (c-offsets-alist
+                 (statement-cont . (c-lineup-assignments +)))
+                )
+              )
 -(setq c-default-style "libav")
++(setq c-default-style "ffmpeg")
  @end example
  
  @section Development Policy

diff --cc libavformat/mov.c
index f7ae19a,11b4582..004c4c4
--- 1/libavformat/mov.c
--- 2/libavformat/mov.c
+++ b/libavformat/mov.c
@@@ -3030,15 -2842,6 +3031,16 @@@ static int mov_read_seek(AVFormatContex
      return 0;
  }
  
 +static const AVOption options[] = {
 +    {"use_absolute_path",
 +        "allow using absolute path when opening alias, this is a possible security issue",
 +        offsetof(MOVContext, use_absolute_path), FF_OPT_TYPE_INT, {.dbl = 0},
 +        0, 1, AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_DECODING_PARAM},
 +    {NULL}
 +};
 +static const AVClass class = {"mov,mp4,m4a,3gp,3g2,mj2", av_default_item_name, options, LIBAVUTIL_VERSION_INT};
 +
++
  AVInputFormat ff_mov_demuxer = {
      .name           = "mov,mp4,m4a,3gp,3g2,mj2",
      .long_name      = NULL_IF_CONFIG_SMALL("QuickTime/MPEG-4/Motion JPEG 2000 format"),

diff --cc libswscale/output.c
Simple merge