Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Don't flush after each written packet

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

Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'

* commit '7df9e693a34c84c698da60426c78140c950f95ed':
  cosmetics: Fix ATRAC codec name spelling

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

Merge commit '488b2984fece7ad0c2596826fee18e74aa904667'

* commit '488b2984fece7ad0c2596826fee18e74aa904667':
  ape demuxer: check for EOF in potentially long loops

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

Merge commit 'a7c1689dedd11689edb30088d467ac03f9b8d1cf'

* commit 'a7c1689dedd11689edb30088d467ac03f9b8d1cf':
  4xm: check that bits per sample is strictly positive

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

avformat/utils: Fix bitrate overflow check

The check added in df33a58e5311ee9a64a573889b883a80e981af7b does not work
at all, rather it broke the summing of bitrates completely.
The comparission was wrong way around.
This commit replaces it by a simpler and hopefully clearer check

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

Merge commit 'df33a58e5311ee9a64a573889b883a80e981af7b'

* commit 'df33a58e5311ee9a64a573889b883a80e981af7b':
  lavf: avoid integer overflow when estimating bitrate

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

Merge commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303'

* commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303':
  lavf: move a variable declaration to the block where it's used

Conflicts:
libavformat/utils.c

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

riff: add 0x64 to g726 works on g726-test1.wav

Merge commit 'fe9bb61f9a16be19ad91875632c39e44b7a99a8a'

* commit 'fe9bb61f9a16be19ad91875632c39e44b7a99a8a':
  pictordec: pass correct context to avpriv_request_sample

Conflicts:
libavcodec/pictordec.c

No change as the avpriv_request_sample() has already been replaced by an implementation
of the codepath.

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

Merge commit '5f7aecde02a95451e514c809f2794c1deba80695'

* commit '5f7aecde02a95451e514c809f2794c1deba80695':
  pictordec: break out of both decoding loops when y drops below 0

Conflicts:
libavcodec/pictordec.c

The added check is redundant.
It shows the error path more clearly though

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

avcodec/vcr1: replace redundant checks from libav (8aba7968dd604aae91ee42cbce0be3dad7dceb30)  by asserts

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

Merge commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30'

* commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30':
  vcr1: add sanity checks

Conflicts:
libavcodec/vcr1.c

See: 845724c82c1a732ab398c9e8cedd178f96f1626d
See: 8e09482e4d27d65bbce2ce5c2f4392216011ed09
Merged-by: Michael Niedermayer <michaelni@gmx.at>

movenc: Don't flush after each written packet

This should improve write performance quite significantly.
---
Tested with both writing a normal mp4, by using the faststart
feature and writing a fragmented mp4 file; all turn out with the
same md5sum as before.

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

avfilter/vf_yadif: reallocate frames if strides differ

Fixes Ticket2896

An alternative to this would be to change the code to support any
stride.
The condition of differing strides should be rare.
If theres no speedloss supporting any stride would be better

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

avutil/fifo: assert that theres enough data in the fifo on drain calls.

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

w64dec: fix end position of summarylist guid

Noticed-by: James Almer
Signed-off-by: Paul B Mahol <onemda@gmail.com>

w64dec: fix skipping of unknown guids

Regression since 14d50c1.
Fixes #2932.

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

avpacket: Fixing side data copy when src == dst

Fixing av_packet_copy_side_data to work correctly when source and
destination are the same. This makes sure that there is no memory
leak and double frees.

Signed-off by: Vignesh Venkatasubramanian <vigneshv@google.com>

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

cosmetics: Fix ATRAC codec name spelling

ape demuxer: check for EOF in potentially long loops

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

4xm: check that bits per sample is strictly positive

Avoids a divide by zero.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

lavf: avoid integer overflow when estimating bitrate

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

lavf: move a variable declaration to the block where it's used

pictordec: pass correct context to avpriv_request_sample

Fixes invalid reads.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

pictordec: break out of both decoding loops when y drops below 0

Otherwise picmemset can get called with negative y, resulting in an
invalid write.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

vcr1: add sanity checks

Fixes invalid reads with corrupted files.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

avformat/movenc: Use the rate from av_timecode_init_from_string() for tmcd

Fixes Ticket2892
Reveiwed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/pnmdec: fix unaligned read

Fixes fate-lavf-pam on alpha

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

avcodec/pnmdec: use a more specific pointer type than void in samplecpy()

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

Avoid a deadlock when decoding wma.

Fixes ticket #2925.

avfilter/vf_fps: make sure the fifo is not empty before using it

Fixes Ticket2905

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

lavc: add teletext decoder using libzvbi

Based on a patch by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>.
http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-December/136677.html

The original patch was rebased by Tudor SUCIU <tudor.suciu@gmail.com>.

Lots of additional features and fixes are made by me.

Fixes ticket #2086.

Changes since last version:
- change default page to all pages

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Read h264 headers from v4l2 to allow stream-copying.

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

avcodec/ffv1dec: reorganize thread init/update

This moves some allocations to init, reducing possible failure modes in update.
Always copies from the previous context instead of just during init

Fixes Ticket2923

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

avcodec/ffv1dec: move initial_states init to init_thread_copy()

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

Read h264 headers from v4l2 to allow stream-copying.

Fixes ticket #2882.
Analyzed and tested by William C Bonner.

pcm-dvd: use av_freep()

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

pcm-dvd: remove redundant log message

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

doc: fix insane hard texi2html dependancy

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

pixfmt: add native bayer 16bit formats

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

libavutil: add AV_PIX_FMT_BAYER pixel formats

The pixel format descriptors are set to more or less arbitrary
values as bayer formats do not fit in the descriptors structure.
These values are currently not used for bayer formats and thus
do not matter.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm-dvd: Fix build on big endian

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

Merge commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c'

* commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c':
  configure: Add docdir configuration option

Conflicts:
configure
doc/Makefile

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

Merge commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce'

* commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce':
  vf_lut: Constantize

Conflicts:
libavfilter/vf_lut.c

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

avcodec/pcm-dvd: discard buffer if block size changed

This prevents a potential crash

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

pcm-dvd: Fix build on big endian

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9'

* commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9':
  pcm_dvd: consolidate pieces from pcm.c and mpeg.c

Conflicts:
libavcodec/pcm.c
libavcodec/version.h
libavformat/mpeg.c

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

fate: update fate tests after master:291ad12ea2d1: ffprobe: show probe_score in the format section

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

ffprobe: show probe_score in the format section

Should address trac ticket #2621.

ffprobe: fix format section XML validation

It was broken since 2186a7e547fdda716138444c8345ce8b823f2d4a.

avcodec/h264: set er.ref_count earlier

Fixes Ticket2910

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

avcodec/error_resilience: change out commented printf() to av_log()

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

avformat/utils: fix duration_fields calculation when need_parsing=0

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

avformat/lxfdec: use a parser to parse video frame headers

lxf needs a parser (or would need to set a few fields explicitly).
Fixes Ticket2917

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

pcm-dvd: Fix build on big endian

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

avcodec/utils: avcodec_string: print colorspace type

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

avcodec/utils: avcodec_string: Print color_range

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

avcodec/utils: avcodec_string: make the colorspace printing code more extendible.

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

configure: Add docdir configuration option

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

vf_lut: Constantize

The pixel format tables are never modified, mark them as constant.

Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix make checkheaders for wavpackenc.h
  Fix make checkheaders for vdpau_internal.h

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm_bluray: cosmetics

Conflicts:
libavcodec/pcm-bluray.c

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

Merge commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f'

* commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f':
  pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c

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

Fix make checkheaders for wavpackenc.h

Fix make checkheaders for vdpau_internal.h

pcm_dvd: consolidate pieces from pcm.c and mpeg.c

Remove the header decoding for PCM audio from mpeg.c and the
20/24bit parts from pcm.c and merge them into a new decoder in
pcm-dvd.c.

The decoder has added support for samples that span multiple
packets and modified 20/24bit group decoding. Both is needed to
decode samples that have been generated with DVD-Lab Pro 2. The
decoding of 16bit PCM and two channel 24bit is identical to
before. No other samples are known to verify the correctness of
the encoding this software does.
The complete list of tested formats is
48kHz/16bit/2-8 channels
48kHz/24bit/2-5 channels
96kHz/16bit/2-4 channels
96kHz/24bit/2 channels

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

pcm_bluray: cosmetics

pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c

The original idea was to collect PCM codecs that could appear in various
MPEG streams in this file. Discussion in IRC lead to the conclusion that
one codec per file would be better and stop the need for #ifdefs.

avformat/avidec: match first index and first packet size=0 handling

Fixes Ticket2861

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

avcodec/dsputil: fix signedness in sizeof() comparissions

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

avcodec/pngdsp: fix (un)signed type in end comparission

Fixes out of array accesses
Fixes Ticket2919

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

lavu/bprint: add append buffer function

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reveiwed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/avpacket: Use av_free_packet() in error cleanups

This prevents memleaks on errors
reproduceable with fate when error pathes are forced

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

vformat/subtitles: check av_copy_packets return code

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

kgv1dec: remove unused avctx from codec private context

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

kgv1dec: make decoder independent of sizeof(AVFrame)

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

wnv1: remove unused avctx from codec private context

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

avcodec/pngdec: fix last_row_size type

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

avcodec/pngdec: Fix padded alloc code with threads

Fixes Ticket2903
Fixes out of array write
no releases should be affected by this

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

Reinstate proper FFmpeg license for all files.

Fix compilation with --disable-mmx.

cmdutils: silence warning about incompatible pointer types

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

avcodec/mpegvideo: reduce log level for messages about allocating frames.

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

ffv1dec: Check bits_per_raw_sample and colorspace for equality in ver 0/1 headers

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: don't return a value from a function declared void

See: 01a82f1dc544df7a4affb3858d12b7b2e492cbba

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

Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4'

* commit 'e998b56362c711701b3daa34e7b956e7126336f4':
  x86: avcodec: Consistently structure CPU extension initialization

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

avcodec/x86/lpc: Fix cpu flag checks so they work

Broken by 6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0

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

avcodec/x86/vp8dsp: Fix cpu flag checks so they work

Broken by 6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0

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

Merge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0'

* commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0':
  x86: avcodec: Use convenience macros to check for CPU flags

Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/motion_est.c

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

Merge commit '79aec43ce813a3e270743ca64fa3f31fa43df80b'

* commit '79aec43ce813a3e270743ca64fa3f31fa43df80b':
  x86: Add and use more convenience macros to check CPU extension availability

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

ppc: don't return a value from a function declared void

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

Merge commit 'a6b650118543e1580e872896d8976042b7c32d01'

* commit 'a6b650118543e1580e872896d8976042b7c32d01':
  ppc: cosmetics: Consistently format CPU flag detection invocations

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

doc/encoders: reformat and add some clarification in libtwolame doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

doc/encoders: reformat libmp3lame doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

ffv1dec: check that global parameters dont change in version 0/1

Such changes are not allowed nor supported

Fixes Ticket2906

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

avcodec/ffv1dec: check global header version

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

avcodec/mpegvideo: Dont incorrectly warn about missing keyframes

Files starting with B frames in presentation order generated the
"no keyframe" warning before this change.

Based on patch by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ppc: don't return a value from a function declared void

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

snow: Check av_frame_alloc() failures

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

avcodec/snow: gray support

Fixes Ticket839

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