avfilter/vf_scale: do aspect ratio and scale factor compensation together

Fixes rounding error

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

Merge branch 'scale-filter-factor' of https://github.com/lkiesow/FFmpeg

* 'scale-filter-factor' of https://github.com/lkiesow/FFmpeg:
  Documentation for scale filter factor
  Documentation for scale filter factor
  Fixed factor for scale filter
  Factors for scale filter

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

avcodec/libx264: also consider ticks per frame for fps/timebase setup

Setting fps = 1/timebase is not correct

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

x86/lossless_videodsp: silly one-line cosmetic.

Documentation for scale filter factor

Documentation for scale filter factor

Fixed factor for scale filter

Factors for scale filter

x86/lossless_videodsp: use common macro for add and diff int16 loop.

x86/lossless_videodsp: simplify and explicit aligned/unaligned flags

lavfi/drawtext: add option for drawing border around text

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/drawtext: get bitmap from glyph in a separate step

This change makes it possible to transform the glyph or get its border before
turning it into a bitmap.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'rbultje/vp9-simd'

* rbultje/vp9-simd:
  vp9: fix memory corruption if header decoding fails after size change.
  vp9/x86: use explicit register for relative stack references.
  vp9/x86: iwht4x4 (lossless) mmx.
  vp9/x86: 4x4 iadst SIMD (ssse3) variants.
  vp9/x86: 8x8 iadst SIMD (ssse3/avx) variants.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dxtory: compressed RGB555/RGB565 decoding support

Conflicts:
libavcodec/dxtory.c

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

Merge commit '0e1ad2f591b87e944550c15b54e54f8189743289'

* commit '0e1ad2f591b87e944550c15b54e54f8189743289':
  dxtory: add more compressed and uncompressed modes

Conflicts:
libavcodec/dxtory.c

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

vp9: fix memory corruption if header decoding fails after size change.

vp9/x86: use explicit register for relative stack references.

Before this patch, we explicitly modify rsp, which isn't necessarily
universally acceptable, since the space under the stack pointer might
be modified in things like signal handlers. Therefore, use an explicit
register to hold the stack pointer relative to the bottom of the stack
(i.e. rsp). This will also clear out valgrind errors about the use of
uninitialized data that started occurring after the idct16x16/ssse3
optimizations were first merged.

vp9/x86: iwht4x4 (lossless) mmx.

vp9/x86: 4x4 iadst SIMD (ssse3) variants.

Cycle measurements for intra itxfm_4x4_add on ped1080p.webm:
idct_idct:    66 -> 67 cycles (noise measurement)
idct_iadst:  199 -> 79 cycles
iadst_idct:  165 -> 70 cycles
iadst_iadst: 183 -> 82 cycles

vp9/x86: 8x8 iadst SIMD (ssse3/avx) variants.

Cycle measurements for intra itxfm_8x8_add on ped1080p.webm:
idct_idct:   133 -> 135 cycles (noise measurement)
idct_iadst:  900 -> 241 cycles
iadst_idct:  864 -> 215 cycles
iadst_iadst: 973 -> 310 cycles

avcodec/dvbsubdec: Remove unused display_list_size

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

Fixed a memory leak in dvbsubenc.c: sub->num_rects was reduced without freeing the associated rects.

Signed-off-by: Wim Vander Schelden <lists@fixnum.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavf/avienc: cosmetic indent

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

lavf/avienc: use metadata_header_padding

The muxer will write at least the number of bytes requested and possibly
up to 3 bytes more.  This is because the muxer writes 32-bit integers
and the format requires 4-byte alignment anyway.

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

lavf/id3v2enc: update comment about minimum padding

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

lavf/id3v2enc: use metadata_header_padding

As with the change to flacenc this allows the user to control the amount
of padding they want added to the file.

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

lavf/flacenc: fix comment after previous change

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

lavf/flacenc: use metadata_header_padding

Allows a user to control the amount, if any, of padding they want added
to the file.  If set to zero the block will not be written at all.  If
set to some positive number four more bytes will be added to the file
due to the small header required for the block.

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

AVFormatContext: add metadata_header_padding field

This field is used to store the number of bytes that should be written
as padding to a metadata header of a file.  For example:
 - The FLAC format's METADATA_BLOCK_PADDING [1]
 - The ID3v2 tag format's padding           [2]

[1] http://xiph.org/flac/format.html#metadata_block_padding
[2] http://id3.org/id3v2.3.0#ID3v2_overview

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

mpegts demuxer: store PMT values of DVB teletext to extradata

* Using extradata by TS demuxer to store values from PMT
* Support of multiple languages in one DVB teletext stream:
  comma separated language codes in metadata "language" field

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

mpegts muxer: restore PMT table of DVB teletext from extradata

* Using extradata by TS muxer to correctly restore PMT table
* PES_header_data_length should be always 0x24 for DVB teletext,
  according to DVB standard

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

mpegts muxer: Change the default subtitle language to "und"

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

avutil/opt: Better print representation of number limits

Signed-off-by: João Bernardo Oliveira <jbvsmo@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dxtory: compressed RGB555/RGB565 decoding support

dxtory: add more compressed and uncompressed modes

avcodec/mpeg12dec: fix mis-indented line

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

avcodec/mpeg12dec: Disable the checked bitstream reader

Mpeg1/2 should not need it

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

avcodec/mpeg12dec: Check for overread in mpeg_decode_slice()

This is needed in case the checked bitstream reader is disabled

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

avcodec/mpeg12dec: check block index in mpeg2_fast_decode_block_non_intra()

Prevents some overreads at the cost of 1 cpu cycle

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

avcodec/mpeg12dec: Optimize mpeg1_decode_block_intra()

sandybridge i7 274->260 cycles

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

avcodec/mpeg12dec: check for overread in mpeg1_fast_decode_block_inter()

No speedloss meassured

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

avcodec/mpeg12dec: Make mpeg2_fast_decode_block_intra() more robust by breaking out on invalid vlcs

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vp9: fix bugs in updating coef probabilities with parallelmode=1

Conflicts:
libavcodec/vp9.c

No change, the bug/buggy code doesnt seem to be in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'bd01412313c728400f1fc5448ede0ad8b51da0d1'

* commit 'bd01412313c728400f1fc5448ede0ad8b51da0d1':
  vp9: fix mvref finding to adhere to bug in libvpx.

Conflicts:
libavcodec/vp9mvs.c

No change
See: dd3d0f46bdb0b9bd204159c67f522cd6f3db7e7c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

examples/filtering_audio,video: do not call avcodec_register_all()

It is implied by av_register_all(). Simplify.

doc/ffmpeg: reference time syntax sections in ffmpeg-utils for itsoffset and timestamp options

Avoid doc duplication and desynching.

vp9: fix bugs in updating coef probabilities with parallelmode=1

- The memcpy was completely wrong because
s->prob_ctx[s->framectxid].coef is a [4][2][2][6][6][3] array, whereas
s->prob.coef is a [4][2][2][6][6][11] array.
- The additional check was committed to ffmpeg by Ronald S. Bultje.

Signed-off-by: Anton Khirnov <anton@khirnov.net>

vp9: fix mvref finding to adhere to bug in libvpx.

Fixes a particular youtube video that I unfortunately can't share.

Signed-off-by: Anton Khirnov <anton@khirnov.net>

avformat/nutenc: fix missing break in switch

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

avfilter/avfilter: fix use of uninitialized pointer

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

avcodec/vc1: fix type of tmp

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

avcodec/libopenjpegenc: Replace av_frame_alloc() and av_frame_ref() by av_frame_clone()

Simplifies code

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

avcodec/mjpegenc: Use av_frame_clone() instead of av_frame_ref()

This avoids the need for double error checking
Fixes CID1163843

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

avcodec/libopenjpegenc: Check the return code of av_frame_ref()

Fixes CID1163842

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

avcodec/h264_cabac: Fix use with the checked bitstream-reader

Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/mtv: add missing MTV_ prefix to macro

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

libavformat/mtv: make clear we assume bpp is always 16

All samples in the wild are RGB565/555 and we are already
acting on this assumption when pushing out the video frames,
so if we get anything != than 16 for bpp we just override
this value for doing any calculations making our approach
consistent.

Also avoid repeatedly shifting bpp.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

libavformat/mtv: donwgrade probe score for < 512

MTV has a 512 bytes header. We should be able to
parse required fiels from the first 57 (rest is
padding) but if we haven't seen enough data then
go with SCORE_EXTENSION.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

libavformat/mtv: Check for min header size first

Abort immediately if we are not getting enough
data to extract the required fields.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

Cinepak encoder: adding option handling for flexibility

Now it is possible to adjust compression speed vs R/D when needed
and also skip vintage players compatibility at will.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec_asf: Copy the need_parsing field from the chained demuxer

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

rtpdec_asf: Copy the need_parsing field from the chained demuxer

This fixes playback of mp3 streams in rtp/asf. This used to work
until c6f1dc8, but mostly by coincidence.

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

ffmpeg: use av_err2str() macro

Simplify.

ffmpeg: apply misc cosmetics to process_input() code

avformat/matroskaenc: wrap V_QUICKTIME codec private in something that looks like its part of quicktime stsd

This is needed for matroska spec compliance
Fixes playback of SVQ3 in matroska with vlc
Fixes Ticket 3256

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

avformat/http: Properly handle cookies that specify sub-domain where the URL.

Fixes ticket #3336

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

avformat/tls: Fix windows build with openSSL enabled.

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

avcodec/x86/lossless_videodsp: disable median optimizations for 16bps

They only support upto 15bps

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

avcodec/lossless_videodsp: Pass AVCodecContext to init

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

avcodec/bitstream: assert that no integer overflow happened when writing codes in build_table()

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

examples/muxing: reindent after previous commit

examples/muxing: flush encoders at the end

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo_enc: Don't call ff_h263dsp_init unconditionally

Conflicts:
libavcodec/mpegvideo_enc.c

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

avcodec/x86/lossless_videodsp: port sub_hfyu_median_prediction_int16 to yasm

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

avcodec/x86/lossless_videodsp: Port sub_hfyu_median_prediction_mmxext to int16

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

avcodec/x86/lossless_videodsp: port add_hfyu_median_prediction_mmxext to 16bit

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

avcodec/x86/lossless_videodsp: add diff_int16_mmx/sse2

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

mpegvideo_enc: Don't call ff_h263dsp_init unconditionally

This fixes builds with e.g. --disable-decoders --disable-encoders
--enable-encoder=mjpeg.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  bfin: vp3: Mark all binary object sections appropriately

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

Merge commit 'ea49f60523c4f4c43cb06a35166b44478d473e51'

* commit 'ea49f60523c4f4c43cb06a35166b44478d473e51':
  h264: skip chroma edges at the picture boundary while deblocking 4:4:4

Conflicts:
libavcodec/h264.c

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

Merge commit '8267f9363532b23b3b8b4e27491ee2d412a8aec3'

* commit '8267f9363532b23b3b8b4e27491ee2d412a8aec3':
  configure: Set default HOSTCFLAGS/HOSTCPPFLAGS after compiler detection

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

avcodec/cinepakenc: fixes and improvements

Fixed/improved multistrip adaptivity.
Improved R/D by optimized codebook generation.
Support for the correct color space.
Vintage compatibility.

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

Adding Cinepak encoder

With permission of Tomas Härdin applied by Rl aetey.se

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

bfin: vp3: Mark all binary object sections appropriately

This fixes a leftover from e44d7c659ba56d7efd6de10d5d99a1c44fd997fa.

h264: skip chroma edges at the picture boundary while deblocking 4:4:4

This handles macroblock edges for the chroma components in the same way
as for the luma compoment for 4:4:4 streams. The Spec explicitly states
that the deblocking filter is not applied to edges at the boundary of
the picture.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>

configure: Set default HOSTCFLAGS/HOSTCPPFLAGS after compiler detection

This prevents the default HOSTCFLAGS from getting clobbered by flags
passed to configure on the command line.

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavf/ftp: remove double space
  lavf/libssh: fix seek with whence==SEEK_CUR
  lavf/libssh: rename context variable from s into libssh
  lavf/libssh: add av_cold attributes
  lavf/libssh: factorize create_sftp_session function
  lavf/libssh: factorize create_ssh_session function
  lavf/libssh: factorize file_stat function
  lavf/libssh: factorize open_file function
  lavf/libssh: add private_key option

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

lavf/ftp: remove double space

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

lavf/libssh: fix seek with whence==SEEK_CUR

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

lavf/libssh: rename context variable from s into libssh

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

lavf/libssh: add av_cold attributes

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

lavf/libssh: factorize create_sftp_session function

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

lavf/libssh: factorize create_ssh_session function

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

lavf/libssh: factorize file_stat function

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

lavf/libssh: factorize open_file function

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

lavf/libssh: add private_key option

Allows to specify private key to use during authorization.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

avformat/mov: redesign the fps calculation

This uses STTS and TRUN information to calculate the fps
It seems to work with more files than the previous code

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rgb2rgb_template: add MMX/SSE2/AVX-optimized deinterleaveBytes

Conflicts:
libswscale/x86/rgb2rgb_template.c

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

Merge commit '7597e6efe492cb2449bb771054d64cc7fdf62ff5'

* commit '7597e6efe492cb2449bb771054d64cc7fdf62ff5':
  swscale/x86/rgb2rgb: add support for AVX

Conflicts:
libswscale/x86/rgb2rgb_template.c

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

Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9'

* commit '9047491f8bcd87673eed55fb310647a03b0981e9':
  swscale: add nv12/nv21->yuv420 converter

Conflicts:
libswscale/rgb2rgb.c
libswscale/rgb2rgb_template.c

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