* commit '73c6ec6d':
  avconv: create simple filtergraphs earlier
Merged-by: Timothy Gu <timothygu99@gmail.com>

* commit '49670e42':
  avconv: add a function for determining whether a filtergraph is simple

Conflicts:
	avconv.c
Merged-by: Timothy Gu <timothygu99@gmail.com>

* commit '58640fe8':
  h264: handle frame recovery in h264_field_start()

Conflicts:
	libavcodec/h264dec.c
Merged-by: Timothy Gu <timothygu99@gmail.com>

* commit 'e26c6414':
  h264: discard slices of redundant pictures right after parsing the slice header

Conflicts:
	libavcodec/h264_slice.c
	libavcodec/h264dec.c

TODO: fix indentation
Merged-by: Timothy Gu <timothygu99@gmail.com>

* commit '6efc4638':
  h264: always set redundant_pic_count during slice header parsing
Merged-by: Timothy Gu <timothygu99@gmail.com>

* commit '606fb6c0':
  h264: call the hwaccel frame_start() from h264_field_start()

This commit is a noop, as it conflicts with 3e53211a.
Merged-by: Timothy Gu <timothygu99@gmail.com>

This reverts commit e4af9be0 and redoes
796027f2.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>

This reverts commit 796027f2, reversing
changes made to bca30ed2.

Preemptive revert before further testing has been done.

* commit 'd1d76780':
  h264: fix the check for mixed IDR/non-IDR slices

Conflicts:
	libavcodec/h264_slice.c
	libavcodec/h264dec.c
Merged-by: Timothy Gu <timothygu99@gmail.com>

* commit 'b13fc1e3':
  h264: do not pass H264Context to h264_slice_header_parse()

Conflicts:
	libavcodec/h264dec.h

Did not merge the h264_slice_header_parse() part. We use a few other
members of H264Context for error checking in that function.
Merged-by: Timothy Gu <timothygu99@gmail.com>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

If negative pts are possible for some codecs in ogg then the code needs to be
changed to use signed values.
Found-by: Thomas Guilbert <tguilbert@google.com>
Fixes: clusterfuzz_usan-2016-08-02
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Found-by: Thomas Guilbert <tguilbert@google.com>
Fixes: clusterfuzz_usan-2016-08-02
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes ticket #5751.

Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>

It's the proper place since 8c793288Signed-off-by: James Almer <jamrial@gmail.com>

10- and 12-bit DNxHR use the same DC coefficient decoding process and
VLC table, just with a different shift value. From SMPTE 2019-1:2016,
8.2.4 DC Coefficient Decoding:

"For 8-bit video sampling, the maximum value of η=11 and for
10-/12-bit video sampling, the maximum value of η=13."

A sample file will be uploaded to show that with this patch, things
decode correctly:
dnxhr_hqx_12bit_1080p_smpte_colorbars_davinci_resolve.mov
Signed-off-by: Steven Robertson <steven@strobe.cc>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Show proper #include's on struct pages.

Before:

    #include <buffer.h>

After

    #include <libavutil/buffer.h>

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

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

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

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

In order to avoid possible clipping at the very
beginning. Especially apparent when "alternative"
boundary mode is used.

Adopted from original commit by committer.

Doxygen gets confused by this.

Fixes ticket #5484.

The interface has been stable for some time now.

The Doxygen command is generated from the list of installed headers,
which may change per configuration (e.g. `--enable-gpl` results in
libpostproc to be built and installed).

Reported-by: applemax82