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

Matthew J Heaney is added to the list of ffmpeg maintainers, for the
WebVTT demuxer and muxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This results in more alignment for pixel formats that have "odd" pixel
sizes like RGB24. It makes access through SIMD easier

Works around Issue described in Ticket1031
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  lavfi: math typo in interlace filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Might fix Ticket1874
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes an assertion when called on uninitialized frame. Spotted after
seeking in vlc.
Fixes ticket #2461.

Tested-by: Timo
Reviewed-by: Joakim Plate
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

This reverts commit 4cbf245f2a2cd2170ca30b0788c2af5b506fe6d6.

I messed up the author information.

Fixes an assertion when called on uninitialized frame. Spotted after
seeking in vlc.
Fixes ticket #2461.

Tested-by: Timo
Reviewed-by: Joakim Plate

Makes it easier to understand that there is no difference in init
callback for movie and amovie. Also saves a few lines of code.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

Also do not check against empty string, the lower levels should
be able to deal with it.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

This revision creates a WebVTT muxer, that outputs files having the
format described in the following specification:

http://dev.w3.org/html5/webvtt/

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

avoid using freed pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes Ticket2612
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It is notably known to break playback on http streaming servers who use
the user agent to guess if it's a browser (to display a summary) or a
player (to stream the audio data).

This reverts 1fabd950.

Fixes Ticket #2663.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

The unified clock state holds this information now.
Signed-off-by: Marton Balint <cus@passwd.hu>

Fixes regression with subtitles introduced in f2175a62.
Fixes ticket #2666.
Signed-off-by: Marton Balint <cus@passwd.hu>

Fixes Coverity CID 1026769 and 1026756.
Signed-off-by: Marton Balint <cus@passwd.hu>

* qatar/master:
  smacker: check frame size validity

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

* commit '58c95448':
  smacker: pad the extradata allocation

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

* commit 'bbb2945f':
  smacker: check the return value of smacker_decode_tree

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

* commit 'f52edef3':
  smacker: fix an off by one in huff.length computation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '985f34b7':
  utils: fix avcodec_flush_buffers pre-reference counting compatibility

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

* commit 'df9f22d4':
  avf: move url utility functions in a separate file

Conflicts:
	libavformat/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '12db891d':
  avf: move ff_write_chained to mux.c

Conflicts:
	libavformat/mux.c
	libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '508998f7':
  avf: move riff tags accessors where they belong

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

* commit 'ec7c51c7':
  avf: move ff_http_match_no_proxy to network

Conflicts:
	libavformat/internal.h
	libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'afc86853':
  avf: split off format register and lookup function

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

* commit 'f80b60ad':
  bitstream: forward error values and drop few abort()

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

* commit 'f776899a':
  bitstream: K&R formatting cosmetics

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

* commit '9e80eda2':
  h264_mp4toannexb_bsf: return a padded buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8d929afd':
  h264_mp4toannexb_bsf: factor out extradata parsing

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

* commit '5d21ca45':
  h264_mp4toannexb_bsf: K&R formatting cosmetics

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

Fixes #2676.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Otherwise, cover art will create video stream with index 0.
Fixes #2677.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>