pthread: Rename thread_init to avoid symbol collision

The AIX threads library exposes a function with the same name.

Signed-off-by: Martin Storsjö <martin@martin.st>
lavc/avcodec.h: fix various typos in av_bitstream_filter_filter() docs
avcodec/avutil: Add AVColorSpace and AVColorRange to AVFrames

This also moves AVColorSpace and AVColorRange from avcodec to avutil

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavc/h264_mp4toannexb: improve feedback in case of invalid bitstream
swscale: Add support to specify chroma position

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
doc/bitstream_filters: document dump_extra
doc/filters: update/correct mp documentation
fmtconvert: Explicitly use int32_t instead of int

Signed-off-by: Martin Storsjö <martin@martin.st>
Merge commit '50612484e058e8b241f0528584d64d9d2ccebf12'

* commit '50612484e058e8b241f0528584d64d9d2ccebf12':
  pthread: Rename thread_init to avoid symbol collision

Conflicts:
	libavcodec/pthread.c
	libavfilter/pthread.c

See: 674d8a9629609a17fd6916164556cb012d6e6a1c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fmtconvert: Explicitly use int32_t instead of int

Conflicts:
	libavcodec/ac3dec.c
	libavcodec/fmtconvert.c
	libavcodec/fmtconvert.h

See: f49564c6075935443323abf4571a62205e7b3c59
Merged-by: Michael Niedermayer <michaelni@gmx.at>
lavf/matroskaenc: Check for valid metadata before creating tags

Tags must have at least one SimpleTag element to be spec conformant.
Updated lavf-mkv and seek-lavf-mkv FATE references as the tests were affected by
this.

Fixes ticket #2785

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
matroskaenc: simplify mkv_check_tag()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fixing a stride issue in VP8 Alpha encode

When encoding alpha channel in libvpx, the stride isn't set
properly for the alpha encoder. Fixing it.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ftp: fix interrupt callback misuse

FTP protocol used interrupt callback to simulate nonblock
operation which is a misuse of this callback.

This commit make FTP protocol fully blocking and removes
invalid usage of interrutp callback

Also adds support for multiline responses delimited with dashes
ftp: remove unused headers
ftp: comments
ftp: warning about pure-ftp server used as and output
swscale/options: fix copy and paste typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Consistently use "cpu_flags" as variable/parameter name for CPU flags
lavf/matroskaenc: using valid chapter ids

Fixes ticket 2790, by starting the ChapterUIDs in mkv files with 1 instead of a 0.
 

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