* commit '8e104619':
  shorten: check for return value

Conflicts:
	libavcodec/shorten.c

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

* commit 'd5d2d6c3':
  dcadec: initialize variables before use

Conflicts:
	libavcodec/dcadec.c

See: 53918a1cMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1a9c1333':
  escape124: explicitly set get_bits1 variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2ffb0598':
  mlpdec: check for negative index

Conflicts:
	libavcodec/mlpdec.c

See: 8491ac3aMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6abe7eda':
  ffv1: fix out-of-bounds read

The change should be harmless but theres no out of array access before
the change
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5aa710f4':
  vorbisenc: add missing parenthesis

Conflicts:
	libavcodec/vorbisenc.c

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

* commit 'e9a6ae77':
  dpxenc: mention missing break

Conflicts:
	libavcodec/dpxenc.c

No change as the changed code is implemented differently in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4dda5e9b':
  sunrastenc: mention missing break
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '28d82b76':
  vc1dec: refactor check with missing parenthesis

Conflicts:
	libavcodec/vc1_mc.c
	tests/ref/fate/vc1_ilaced_twomv

Theres no change to the reference checksums as this bug was not
in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2c98dc75':
  vc1dec: always initialize tx and ty

Not merged, tx/ty are initialized on every codepath before use
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e3f50f24':
  dnxhdenc: check negative index

Conflicts:
	libavcodec/dnxhdenc.c

Not merged, the cid index thats taken out of our table will be found again in
said table.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b1b1a737':
  display: fix order of operands

Conflicts:
	libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bdcb5794':
  nellymoserenc: fix array index

Not merged, the original code was correct.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'aa7c429c':
  nellymoserenc: fix array element ordering

See: 62722ae2Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8dd0a2c5':
  libopusenc: prevent an out-of-bounds read by returning early
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b09cf8af':
  libopusenc: check return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '29234f56':
  vp7: fix checking vp7_feature_value_size()

See: 28f8114bMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '68a35473':
  4xm: more thorought check for negative index and negative shift

Conflicts:
	libavcodec/4xm.c

Mostly not merged, the added checks, check for impossible conditions
for paranoias sake they are replaced by asserts but thats probably overkill
the vlc table does not contain out of range values or holes,
nor does it permit the log2 values to become negative. Whenever a
log2 value reaches 0 the selected table no longer contains an entry to trigger
the case that would decrease it further

Adding such impossible checks would confuse the reader
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket3979
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Avoid a possible negative bitshift.

CC: libav-stable@libav.org
Bug-Id: CID 1194400

CC: libav-stable@libav.org
Bug-Id: CID 700751 / CID 700752

Makes coverity less confused.

CC: libav-stable@libav.org
Bug-Id: CID 1203487

CC: libav-stable@libav.org
Bug-Id: CID 970924

CC: libav-stable@libav.org
Bug-Id: CID 1047234

Bug-Id: CID 1238791

Bug-Id: CID 732229

Bug-Id: CID 732231

FATE tests updated accordingly, no visual difference.

CC: libav-stable@libav.org
Bug-Id: CID 1087087

CC: libav-stable@libav.org
Bug-Id: CID 1245702 / CID 1245703

CC: libav-stable@libav.org
Bug-Id: CID 700464

CC: libav-stable@libav.org
Bug-Id: CID 1238828 / CID 1238832

CC: libav-stable@libav.org
Bug-Id: CID 732258

Fixes assertion failures and valgrind warnings in trellis encoder.

CC: libav-stable@libav.org
Bug-Id: CID 732256 / CID 732257

CC: libav-stable@libav.org
Bug-Id: CID 1244188

CC: libav-stable@libav.org
Bug-Id: CID 739870

CC: libav-stable@libav.org
Bug-Id: CID 1197061

CC: libav-stable@libav.org
Bug-Id: CID 1087094

Fixes Ticket4053
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>