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

* commit '90944ee3':
  avconv: refactor selecting an encoder

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c
Merged-by: James Almer <jamrial@gmail.com>

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

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

Fixes Debian bugs #831529, #831909, #832964.
Signed-off-by: Mark Thompson <sw@jkqxz.net>

When finding a video mode based on frame size and frame rate,
use AVRational methods instead of simple comparison. Add debug information.
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Provide the stream with the correct fps information when capturing.
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

Also set a default_whitelist for mmsh and ffrtmphttp.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Mostly useful with channel color scheme.

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

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

This will be used to allow writing file sequences using the tee output onto
multiple places in parallel
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Also don't include it on files that don't need it.

This reduces differences with libav
Tested-by: Timothy Gu <timothygu99@gmail.com>
Reveiwed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

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

These two fields are already initialized to the same values in
new_attachment_stream().

* commit '5e184062':
  avconv: fix handling attachments in init_output_stream

Conflicts:
	avconv.c

This is functionally a no-op, as we don't have the bug this is trying to
fix. See 843be56e.
Merged-by: Timothy Gu <timothygu99@gmail.com>

* 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>