swscale: support internal scaler cascades

Fixes Ticket3170

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

avcodec/mpeg12dec: print aspect_ratio_info in debug output

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

Merge commit '1d4579e38ecad578c86516fad2837a273d11b320'

* commit '1d4579e38ecad578c86516fad2837a273d11b320':
  tcp: Add AVOption support

Conflicts:
libavformat/tcp.c

See: 2e009c6042bde419599ebed9165e597bbef23b2f
Merged-by: Michael Niedermayer <michaelni@gmx.at>

avformat/assenc: make sure we crawl extradata only if it's non-null

Merge commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119'

* commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119':
  tls: Support passing old-style tcp options

See: 4f4eb380f0f96dbb7cdd2b812fa92b8b47a0f27c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f'

* commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f':
  rtsp: Add rtsps to the probe

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

Merge commit 'c839b0439f0b01c72a6d253920d2e342b30f8bcb'

* commit 'c839b0439f0b01c72a6d253920d2e342b30f8bcb':
  rtsp: Support tls when in listen mode

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

Merge commit '8b2e9636c57b22582143467a8a06b509b47b92f9'

* commit '8b2e9636c57b22582143467a8a06b509b47b92f9':
  rtsp: Support tls-encapsulated RTSP

Conflicts:
libavformat/rtsp.c

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

Merge commit 'c27328e749ff3be648411765cd17362fee017341'

* commit 'c27328e749ff3be648411765cd17362fee017341':
  rtsp: Check for command strings without spaces

Conflicts:
libavformat/rtspdec.c

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

Merge commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d'

* commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d':
  sctp: Use AVERROR_BUG instead of abort()

Conflicts:
libavformat/sctp.c

See: 2e59142fa9a0db5fab8aa2e676ba524f61280b83
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'eb4f9069002e73648f6640cd054fc814cfda75b8'

* commit 'eb4f9069002e73648f6640cd054fc814cfda75b8':
  lavf: More informative error message

Conflicts:
libavformat/mux.c

See: 30ced7e69f434bd49b39fb7c8ce02d9ba71babfc
Merged-by: Michael Niedermayer <michaelni@gmx.at>

utvideoenc: properly set slice height/last line

Mimic decoder and obey sampling.

Does not affect fate tests for utvideo.
Fixes ticket #3949.

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

avutil/softfloat: Fix undefined shift in av_add_sf()

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

avformat/movenc: add EAC3 muxing support.

Support only one independent substream right now, and only syncframes
containing 6 blocks.

Fixes part of ticket #3074

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

float_dsp-test: allow forcing cpuflags

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

avcodec/atrac3: use av_freep(), do not leave stale pointers in memory

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

avcodec/cavs: use av_freep(), do not leave stale pointers in memory

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

tcp: Add AVOption support

tls: Support passing old-style tcp options

Make tcp and tls urls near-interchangeable.

rtsp: Add rtsps to the probe

rtsp: Support tls when in listen mode

rtsp: Support tls-encapsulated RTSP

rtsp: Check for command strings without spaces

Prevent a NULL-pointer dereference.

CC: libav-stable@libav.org

sctp: Use AVERROR_BUG instead of abort()

Trying to write to a stream id larger the the maximum requested is
a programming error, still there is no reason to leave a
reachable abort() in the codebase.

CC: libav-stable@libav.org

lavf: More informative error message

Print the timestamp values and not just the stream index.

libavcodec/ppc/hpeldsp_altivec.c : fix ff_put_pixels16_altivec() for POWER LE

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

libavcodec/ppc/me_cmp.c : fix sad16_altivec() sse16_altivec() sad16_xy2_altivec() sad16_x2_altivec() sad16_y2_altivec() sad8_altivec() for POWER LE

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

vp9: enable multi-thread decoding when refreshctx is equal to 0

In vp9_decode_frame function, ff_thread_finish_setup is not called
when refreshctx is equal to 0, and the next decoding thread can not
start work until the cunrrent frame has been decoded completely. So
ff_thread_finish_setup needs to be called to enable Multi-thread
decoding in this condition.

Signed-off-by: Di Wu <di1028.wu@samsung.com>
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

libavcodec/ppc/mpegvideoencdsp.c : fix pix_norm1_altivec() and pix_sum_altivec() for POWER LE

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

libavcodec/ppc/pixblockdsp.c : fix get_pixels_altivec() and diff_pixels_altivec() for POWER LE

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

Merge commit 'b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae'

* commit 'b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae':
  w32pthreads: use the condition variable API directly when targeting newer versions of Windows

Conflicts:
compat/w32pthreads.h

See: 8c6992bf0cc24542a5ae245cd037a23638b76d75
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '73ea3ffcd55b0b1d23ba4769d65996a8d58ffa11'

* commit '73ea3ffcd55b0b1d23ba4769d65996a8d58ffa11':
  w32pthreads: use the CONDITION_VARIABLE typedef if available

Conflicts:
compat/w32pthreads.h
configure

See: 0c0694931442ef9ea91eace120e0629e0ac01b76
Merged-by: Michael Niedermayer <michaelni@gmx.at>

w32pthreads: use the condition variable API directly when targeting newer versions of Windows

Wrap the function calls in a similar fashion to how it's being done
with the critical section API.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>

w32pthreads: use the CONDITION_VARIABLE typedef if available

This silences warnings about passing arguments from incompatible pointer type
when targeting Windows Vista or newer.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>

ffprobe: Simplify by using av_color_range_name()

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

avformat/format: move mime_type_opt declaration to where its used

also remove a related dead store

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

avformat/os_support: include unistd.h before defining lseek to lseek64 on android

fixes build failure

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

avutil/error: Add AVERROR_INPUT_CHANGED & AVERROR_OUTPUT_CHANGED to error_entries[]

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

lavf/webm_dash: Allow filenames without directories

Fix basename computation code to allow just file names without any
directories in the path.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffplay: dont leave swresampler in half initialized state

On init failure, let's just free it, so next time it will be recreated from
start.

Also fixes Coverity CID 1241515.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>

compat/w32pthreads: use the condition variable API directly when targeting newer versions of Windows

Wrap the function calls in a similar fashion to how it's being done
with the critical section API.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

Fix writing first audio Cues in dash mode.

In dahsmode Matroska is not writing the first Cluster for every
audio stream in the Cues element.

Signed-off-by: Frank Galligan <frankgalligan@gmail.com>
Reviewed-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

compat/w32pthreads: use the CONDITION_VARIABLE typedef if available

This silences warnings about passing arguments from incompatible pointer type
when targeting Windows Vista or newer.

Tested-by: Matt Oliver <protogonoi@gmail.com>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

avutil/softfloat: add some asserts

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

avutil/softfloat: Fix dependence on signed overflow in av_normalize1_sf()

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

avutil/Makefile: add softfloat to TESTPROGS

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

avformat/mov: E-AC-3 streams need parsing too.

syncframes in E-AC-3 can be combined to provide 6 audio blocks per
sample, thus requiring parsing for proper decoding.

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

lavf: fix 2GB file seek limit on Android

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

Merge commit '2bc220958c7570020d87ee353db65460b518998a'

* commit '2bc220958c7570020d87ee353db65460b518998a':
  ismindex: handle discontinuous streams better

Conflicts:
tools/ismindex.c

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

ismindex: handle discontinuous streams better

Reads the fragment duration from the trun sample data, rather than
assuming that there are no gaps. Creates much better playlists for our
inputs.

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

ismindex: handle discontinuous streams better

Read the fragment duration from the trun sample data, rather than
assuming that there are no gaps.

Signed-off-by: Martin Storsjö <martin@martin.st>

avformat/mov: Fix 'warning: format specifies type unsigned short but the argument has type int'

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

avcodec/utils: Fix "warning: pointer type mismatch in conditional expression"

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

avformat/dump: use format dump_separator if the codec one is not set

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

avcodec/utils: Add missing AV_PIX_FMT_YUVJ411P to color_range override code.

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

fix seperator typo

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

Merge commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7'

* commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7':
  vc1: initialize color properties

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

Merge commit 'eddf95283fbba1b469b76e7518bc3941f671b193'

* commit 'eddf95283fbba1b469b76e7518bc3941f671b193':
  vp9: initialize color space and range properties

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

Merge commit '65875a8b3b079752da25a61ec188d2e3d90a569f'

* commit '65875a8b3b079752da25a61ec188d2e3d90a569f':
  vp8: initialize color space and range properties

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

Merge commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6'

* commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6':
  mov: support the Color Parameter Atoms 'colr'

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

Merge commit '586ea0379c207a942c1f2d61e0b3a63c458cc598'

* commit '586ea0379c207a942c1f2d61e0b3a63c458cc598':
  avcodec: fix colorspace option description

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

Merge commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b'

* commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b':
  avcodec: add enum values on chroma sample location

Conflicts:
libavcodec/version.h

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

Merge commit '9d5fed6dc4cccb0689f694112f5026988bebc472'

* commit '9d5fed6dc4cccb0689f694112f5026988bebc472':
  avcodec: fix descriptions on color transfer options

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

Merge commit '167e6f1489368a4693145da61cb022c113a285bc'

* commit '167e6f1489368a4693145da61cb022c113a285bc':
  dump: Update streams and chapters printout format

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

Merge commit '9f3a70c44224ed92d91df65bb9470a2649e7d019'

* commit '9f3a70c44224ed92d91df65bb9470a2649e7d019':
  dump: print the original coded dimensions when available

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

Merge commit '41e86146e7240f9d42e8cdb86a94bb3eb2bbe15f'

* commit '41e86146e7240f9d42e8cdb86a94bb3eb2bbe15f':
  dump: print detailed color space information

full color triplets are only printed if they are not all equal, otherwise
they are printed as before

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

avformat: Allow choosing the dump format field separator.

The default is to maintain the previous ", " for now.

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

avcodec: Allow choosing the dump format field separator.

The default is to maintain the previous ", " for now.

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

Merge commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8'

* commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8':
  dump: split audio and video probing on multiple lines

Conflicts:
libavcodec/utils.c
libavformat/dump.c

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

Merge commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4'

* commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4':
  pixdesc: return color properties names

Conflicts:
libavutil/pixdesc.c
libavutil/pixdesc.h
libavutil/version.h

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

Merge commit '04ccd584a70fad4ebb29ca340d704970ff313cbc'

* commit '04ccd584a70fad4ebb29ca340d704970ff313cbc':
  pixfmt: mark further reserved values

Conflicts:
libavutil/version.h

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

Merge commit 'c732c62cee43f651775af5547cff99d418248542'

* commit 'c732c62cee43f651775af5547cff99d418248542':
  doc: expand description for some color properties

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

Merge commit 'a2c00d22e71d13b72828147be86aa9e961c6cae6'

* commit 'a2c00d22e71d13b72828147be86aa9e961c6cae6':
  avprobe: print color properties for show_streams

Conflicts:
avprobe.c

Not merged as this code does not build and is incomplete, some parts only
appear in later commits.

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

Merge commit '147f2e91eece6b9021ff5b7f8a3b5ce053566659'

* commit '147f2e91eece6b9021ff5b7f8a3b5ce053566659':
  avcodec: make sure color_range is properly initialized

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

Merge commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576'

* commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576':
  vc1: Split the decoder in components

Conflicts:
libavcodec/Makefile
libavcodec/vc1dec.c

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

Merge commit '7ae9791b641d1183910b6e7faca23f7ae08f8579'

* commit '7ae9791b641d1183910b6e7faca23f7ae08f8579':
  avformat: bump version after mime_type change

Conflicts:
libavformat/version.h

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

Merge commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7'

* commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7':
  avformat: use const char* instead of uint8_t* for AVProbeData.mime_type

Conflicts:
libavformat/format.c

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

avformat/matroskadec: do not trust the default duration to be the real 1/timebase if its less than 5fps

Fixes Ticket3980

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

vc1: initialize color properties

vp9: initialize color space and range properties

vp8: initialize color space and range properties

mov: support the Color Parameter Atoms 'colr'

avcodec: fix colorspace option description

avcodec: add enum values on chroma sample location

avcodec: fix descriptions on color transfer options

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

dump: Update streams and chapters printout format

This matches the -map option which requires '%d:%d' format.

dump: print the original coded dimensions when available

dump: print detailed color space information

dump: split audio and video probing on multiple lines

Also always report pixel format.

pixdesc: return color properties names

pixfmt: mark further reserved values

doc: expand description for some color properties

avprobe: print color properties for show_streams

avcodec: make sure color_range is properly initialized

vc1: Split the decoder in components

Speed up the overall compilation time.

avformat: bump version after mime_type change

Changelog: add "ffprobe -show_pixel_formats option"

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

tests/Makefile: Fix fate-ffprobe with --target-path

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

avformat: use const char* instead of uint8_t* for AVProbeData.mime_type

This makes the field consistent with AVInputFormat.mime_type and the
argument type of av_match_name.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

avcodec/avpicture: use av_freep(), do not leave stale pointers in memory

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