ffmpeg_opt: Dont exit on avformat_find_stream_info() failure if there are streams

This allows "-codec copy -f framecrc" on files with only unindentifyable streams

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

avformat/mux: simplify ff_choose_timebase()

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

dump_stream_format: fix division by 0

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

Merge commit '194be1f43ea391eb986732707435176e579265aa'

* commit '194be1f43ea391eb986732707435176e579265aa':
  lavf: switch to AVStream.time_base as the hint for the muxer timebase

Conflicts:
doc/APIchanges
libavformat/filmstripenc.c
libavformat/movenc.c
libavformat/mxfenc.c
libavformat/oggenc.c
libavformat/swf.h
libavformat/version.h
tests/ref/lavf/mkv

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

avcodec/ass: move playres parameters below scripttype

Suggested-by: wm4

avcodec/ass: explicit PlayRes[XY]

This avoids the following libass warning when using the subtitles
filter: "Neither PlayResX nor PlayResY defined. Assuming 384x288"

Subtitles tests change because the output is ASS and the PlayRes[XY]
ends up in the output.

Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'

* commit 'd754ed41727b1fcbab335b510248a9758a73320c':
  riffenc: take an AVStream instead of an AVCodecContext

Conflicts:
libavformat/nutenc.c

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

Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'

* commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228':
  lavf: add the notimestamps flag to the muxers missing it

Conflicts:
libavformat/adtsenc.c

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

Merge commit 'cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016'

* commit 'cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016':
  rtpenc: base max_frames_per_packet on avg_frame_rate, not codec timebase

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

Merge commit '894682a9739eb8d4bfc024b0d4e5757fcfe47378'

* commit '894682a9739eb8d4bfc024b0d4e5757fcfe47378':
  Remove avserver.

Conflicts:
.gitignore
Changelog
Makefile
configure
doc/ffserver.conf
doc/ffserver.texi
doc/general.texi
ffserver.c
libavformat/Makefile
libavformat/ffm.h
libavformat/ffmdec.c
libavformat/ffmenc.c
tests/fate/avformat.mak
tests/lavf-regression.sh
tests/ref/lavf/ffm
tests/ref/seek/lavf-ffm

Not merged, ffserver does have a maintainer
co maintainers are welcome and needed though !

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

avcodec/huffyuvdec: do not leave alpha values uninitialized

fixes fate failure under valgrind

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

lavf: switch to AVStream.time_base as the hint for the muxer timebase

Previously, AVStream.codec.time_base was used for that purpose, which
was quite confusing for the callers. This change also opens the path for
removing AVStream.codec.

The change in the lavf-mkv test is due to the native timebase (1/1000)
being used instead of the default one (1/90000), so the packets are now
sent to the crc muxer in the same order in which they are demuxed
(previously some of them got reordered because of inexact timestamp
conversion).

riffenc: take an AVStream instead of an AVCodecContext

It will be useful in the following commits.

Also, rename the AVCodecContext pointer name from 'stream' to 'codec'.

lavf: add the notimestamps flag to the muxers missing it

rtpenc: base max_frames_per_packet on avg_frame_rate, not codec timebase

Fall back to 1 (which is what is used for most cases anyway) when the
framerate is not set.

Remove avserver.

It has not been properly maintained for years and there is little hope
of that changing in the future.
It appears simpler to write a new replacement from scratch than
unbreaking it.

Revert "Fix compilation on ppc64 and ppc with pic if gas-preprocessor is installed."

It broke gas-preprocessor detection on PPC64 Linux.
This reverts commit b67bcd784dde7ad2b1a167ce7ffef14f8a0c8074.

swr: remove div/mod from DSP functions.

Also fix a bug with resample_compensation resetting dst_incr.

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

Fix all VDPAU decoders.

Fixes ticket #3726.

avcodec/dcadec: remove unsignedness from constant

POSIX gurantees >=32bit so it all fits in signed int
Also >=32bit ints are assumed througout the codebase

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

Merge commit 'f2ce63246f5c934429f9cb857a794e07624d7912'

* commit 'f2ce63246f5c934429f9cb857a794e07624d7912':
  dcadec: replace ldexpf with a multiplication by a constant

Conflicts:
libavcodec/dcadec.c

See: 6da06ef6bbc01b713f67ffb94e7697eb2393ebe4
See: 9ccb5455ca8c63eb330abd3c2ed6a9b0ae3b755e
See: 6b88f22e895314164eef00ccbdbf11ad97a7c56f
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '44671b57866aab8dd36715ff010e985e25baaf19'

* commit '44671b57866aab8dd36715ff010e985e25baaf19':
  AVFrame: factor out freeing the side data

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

dcadec: replace ldexpf with a multiplication by a constant

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

AVFrame: factor out freeing the side data

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

swscale/swscale: replace potentially slow % by &

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

avcodec/cavsdec: simplify % 512 operations

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

swresample/audioconvert: fix () in FMT_PAIR_FUNC()

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

avcodec/vp8: fix () in macros

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

avcodec/vp9: fix () in macros

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

avcodec/wavpack: fix () in macros

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

presets: remove moldering iPod presets

* Some users are trying to use them for non-ancient iDevices when
  baseline profile and level 1.3/3.0 would not be required.

* "640" and "320" no longer make sense.

* Some recommended options can be viewed at:
  <https://trac.ffmpeg.org/wiki/Encode/H.264#iOS>

Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '9affa784a0743b95bde135b5acfce2183afc35d8'

* commit '9affa784a0743b95bde135b5acfce2183afc35d8':
  vp9 encoder: use a decent default speed setting

Conflicts:
libavcodec/libvpxenc.c

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

Merge commit '74bc9458057f07c0820c3d3264396c4c64442e47'

* commit '74bc9458057f07c0820c3d3264396c4c64442e47':
  flvenc: Don't over-count metadata.

Conflicts:
tests/ref/lavf/flv_fmt
tests/ref/vsynth/vsynth1-flashsv
tests/ref/vsynth/vsynth1-flv
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flv

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

Merge commit '49106844929b7b71ac719064d640f8aa56c89b1f'

* commit '49106844929b7b71ac719064d640f8aa56c89b1f':
  tiffenc: fix packet size calculation

Conflicts:
libavcodec/tiffenc.c

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

avfilter/vf_spp: Use av_malloc_array()

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

vf_sab: use av_malloc_array()

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

vp9 encoder: use a decent default speed setting

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

flvenc: Don't over-count metadata.

Over-counting occurs if framerate is not set.

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

tiffenc: fix packet size calculation

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

Merge commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785'

* commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785':
  jpeg2000: Mark static data init functions as av_cold

Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c

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

jpeg2000: Mark static data init functions as av_cold

ffplay: remove -ec handling code

Its handled by the generic option code

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

avcodec/hevc: new idct + asm

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

Merge commit '71d6551e674c86d07c165439c2bf6613b3892307'

* commit '71d6551e674c86d07c165439c2bf6613b3892307':
  avconv: use the correct variable in comparison

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

avconv: use the correct variable in comparison

avcodec/cavsdec: fix low delay decoding

Fixes Ticket1095

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

avformat/flvdec: Support live flv / NGINX RTMP streams

Fixes Ticket3553

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

swscale/input: fix harmless integer overflow

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

version string: add copyright line to version string

Show the copyright when running `ffmpeg -version'. This is useful for
end users trying to determine whether they are using FFmpeg or Libav.

Signed-off-by: Simon Thelen <ffmpeg@c-14.de>

avcodec/bitstream: try to make vlc init code inherently thread safe

also remove spinlock, it doesnt work on AIX

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

avcodec/bitstream: fill invalid vlc tables entries as last pass instead of first

This avoids writing entries twice

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

avcodec/bitstream: zero vlc tables on allocation

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

Force aix strip to work on 32 and 64 bit by default.

avcodec/h264: fix frame skip code

Fixes Ticket3475

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

avcodec/h264_slice: support skipping loop filtering for non key frames

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

avcodec/h264: use the correct level for droping non intra frames

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

Merge commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb'

* commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb':
  configure: Directly support Android as target OS

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

Merge commit '766f2d965ff1948749c37f26a714adb8aa89c4a9'

* commit '766f2d965ff1948749c37f26a714adb8aa89c4a9':
  gitignore: add dylib and swp entries

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

Merge commit '711aa2a82727907f778fb8aa9a93aff2120170f2'

* commit '711aa2a82727907f778fb8aa9a93aff2120170f2':
  lavf: dump stream side data when probing

Conflicts:
libavformat/dump.c

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

avformat/dump: put copyright back from the file from which dump.c was split out

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

Merge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb'

* commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb':
  lavf: group dump functions together

Conflicts:
libavformat/utils.c

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

Merge commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f'

* commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f':
  vf_showinfo: print display transformation values

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

configure: Directly support Android as target OS

gitignore: add dylib and swp entries

Add nointra AVDiscard level

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not suggest to use gas-preprocessor on aix where it doesn't work.

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

swr: reindent.

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

avcodec/huffyuvdec: Fix fill value for truncated bitstreams

Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Do not suggest to use gas-preprocessor on aix where it doesn't work.

huffyuvdec: use unsafe bitstream reader

The reader reads in chunks of 11 bits at most, and at most 3 times. The unsafe
reader therefore may read 6 chunks instead of 1 in worst case, ie 8 bytes,
which is within the padding tolerance.

The reader ends up being ~10% faster. Cumulative effect of unsafe reading and
code block swapping on 3 sequences is for 1 thread, decoding time goes from
23.3s to 19.0s.

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

huffyuv: fate: add a BGR24 test

It was previously untested.

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

hevc: Fix 4K sample video

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

avformat/smoothstreamingenc: Use av_mallocz_array()

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

Fix compilation on ppc64 and ppc with pic if gas-preprocessor is installed.

avcodec/dvbsubdec: Split save_subtitle_set() out

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

avcodec/dvbsubdec: add AVClass to context

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

avcodec/dvbsubdec: restructure version check

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

avformat/framecrcenc: print the checksum and size of extradata as well

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

huffyuvdec: remove somewhat deprecated code

The old code was reserving the 0xFFFF entry to represent an inexisting
entry/codeword. These entries are now detected through their length
being <= 0. As this entry is often used for the residuals (-1,-1), which
should be among the most frequent, it is particularly important to not
reserve it.

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

MAINTAINERS: Add Co maintainer for huffyuv*, rv4*, vc1*

Patch by: Christophe Gisquet
Commit Message by commiter

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

avcodec/huffyuvdec: assume vlcs can be 32 instead of 31 bits max

This should avoid a division as well

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

huffyuvdec: swap code blocks

The effect is not really deterministic, as it seems to be a combination
on x86_64 of fewer registers used, different jump offsets and, for all
archs, of likely branches.

Speedup is around 15%.

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

swr: compile mmx2 s16p functions only on x86-32.

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

x86util: add and use RSHIFT/LSHIFT macros

Those macros take a byte number as shift argument, as this argument
differs between MMX and SSE2 instructions.

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

fate: yadif: add >8 bit tests

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

aandcttab: fix spelling

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

avcodec/xbmdec: remove dependancy on zero padding on input packet

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

avcodec/indeo5: Fix infinite loop in skip_hdr_extension()

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

swr: add prototypes for resample dsp functions

Should fix compilation failures with MSVC and any other compiler
without inline asm support.

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

avformat/mpc: attempt to allocate a packet that is not smaller than the data inside it

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

swr: remove obsolete function prototypes.

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

ffmpeg: for h264 we need has_b_frames from the decoder

Other solutions welcome

Fixes Ticket3711

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

ffmpeg: print values of mismatching has_b_frames

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

cmdutils: implement FFREPORT=level=...

Fixes Ticket3057

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

doc/filters: remove double quotes from zoompan example

Based on suggested change by Clément Bœsch.

Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/ppc/idct_altivec: add plain idct()

Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

swr: split out DSP functions.

DSP bits of swri_resample go into their own mini-DSP functions; DSP
init goes from a per-call branch in multiple_resample to a proper
DSP init routine; x86 bits go into x86/; swri_resample() moves out of
resample_template.c into resample.c because it's independent of DSP
code or sample type; multiple_resample() is simplified.

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

mpeg12enc: add seq_disp_ext option for deciding when to write a sequence_display_extension

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

mpeg12enc: add support for PANSCAN side data in sequence_display_extension

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

Fix compilation with --disable-everything --enable-parser=vc1.