j2kdec: fix format strings

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

interplayvideodec: pass correct pointer to av_dlog()

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

dvbsubdec: Fix "set but not used" warning

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

libavformat: Fix several "incompatible pointer type" warnings.

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

cavsdec: ensure the tables have been allocated before using them

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mp3dec: perform I/S and M/S only when frame mode is joint stereo.
  id3v2: add another mimetype for JPEG image
  lzw: prevent buffer overreads.
  WMAL: Remove inaccurate and unnecessary doxy
  h264: fix cabac-on-stack after safe cabac reader.
  truemotion2: convert packet header reading to bytestream2.

Conflicts:
libavcodec/lzw.c
libavcodec/truemotion2.c
libavformat/id3v2.c

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

img2dec: remove GLOB_TILDE support.

tilde expansion should/can be done by the shell

Reviewed-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

img2dec: Recognize glob meta chars only if prefixed by %

  This changes globbing support to only be used if the character
contains at least one glob meta character that is preceded by
an unescaped %. To escape a literal % one would use %% which is
identical to the way to match a % with image2 sequence generation
feature.

* Makes it possible to have patterns like %04d-[720p].jpg work
  again with sequence number generation. Previously this would
  always be detected as a glob pattern and was interpreted by
  the image2 glob code instead.

* Makes it possible to use %*-[720p].jpg to match above pattern
  without having to double escape it to be not interpreted by most
  shells and not by the image2 glob code (previously one would
  need to use \*-\\\[720p\\\].jpg to achieve the same)

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

img2: glob matching for image series

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

ffmpeg: check pts like dts for being in the past.

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

lavf: print ts values in pts < dts error message

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

ffmpeg: switch duration calculation code from avg to r frame_rate.

This heuristic is less likely to overshoot and cause encoder failure.

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

mp3dec: perform I/S and M/S only when frame mode is joint stereo.

Looks like some LAME versions produce dual stereo mode MP3s with
flags for intensity and middle stereo set. In this mode those flags
should be ignored like the reference decoder and derived ones do.

id3v2: add another mimetype for JPEG image

Do not try to use lowres for unusual jpg subsampling.

Fixes ticket #1144.

Revert "Fix compilation with hardcoded tables."

This reverts commit b17b2963692f5f7c19a2188e61922e00680c5fb4.

fate/vp8-size-change: set bitexact flag

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

ffmpeg: pass bitexact flag to vsrc_buffer

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

iff: prevent a possible crash with broken/prepared IFF PBM

Based on fix by Peter Ross for ticket #1054.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder

* git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder:
  Fixes ticket 1127. I'm still looking into why bpp is getting set to 0.

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

ffmpeg: dont disable dr1 when changing dimensions are encountered in codec_get_buffer().

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

ffmpeg: disable dr1 when frame sizes change.

dr1 seems to work fine with frame size changes but many filters
cant handle it yet. Simply disabling it forces the alternative
non dr1 code path which has been tested more completely and
is known to handle frame size changes in a wider varity of
cases.

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

avfilter: set w/h in avfilter_fill_frame_from_video_buffer_ref().

This fixes issues with AVFrame w/h being wrong in some cases

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  asf: only set index_read if the index contained entries.
  cabac: add overread protection to BRANCHLESS_GET_CABAC().
  cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC().
  cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE().
  cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC().
  h264: add overread protection to get_cabac_bypass_sign_x86().
  h264: reindent get_cabac_bypass_sign_x86().
  h264: use struct offsets in get_cabac_bypass_sign_x86().
  h264: fix overreads in cabac reader.
  wmall: fix seeking.
  lagarith: fix buffer overreads.
  dvdec: drop unnecessary dv_tablegen.h #include
  build: fix doc generation errors in parallel builds
  Replace memset(0) by zero initializations.
  faandct: Remove FAAN_POSTSCALE define and related code.
  dvenc: print allowed profiles if the video doesn't conform to any of them.
  avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size.
  FATE: add a test for vp8 with changing frame size.
  fate: add kgv1 fate test.
  oggdec: calculate correct timestamps in Ogg/FLAC

Conflicts:
libavcodec/4xm.c
libavcodec/cook.c
libavcodec/dvdata.c
libavcodec/dvdsubdec.c
libavcodec/lagarith.c
libavcodec/lagarithrac.c
libavcodec/utils.c
tests/fate/video.mak

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

lzw: prevent buffer overreads.

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

WMAL: Remove inaccurate and unnecessary doxy

A call to decode_packet() does not always decode a complete WMA packet.
Moreover, this is not the correct place to document calls that are part
of the public API.

Signed-off-by: Diego Biurrun <diego@biurrun.de>

h264: fix cabac-on-stack after safe cabac reader.

Fixes ticket 1127.
I'm still looking into why bpp is getting set to 0.

doc/ffmpeg: update and extend documentation for -copytb

Address trac ticket #1120.

truemotion2: convert packet header reading to bytestream2.

Also use correct buffer sizes in calls to tm2_read_stream(). Together,
this prevents overreads.

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

asf: only set index_read if the index contained entries.

This allows falling back to a binary search if the file contains no
index, thus fixing seeking in such files (e.g. luckynight.wma).

cabac: add overread protection to BRANCHLESS_GET_CABAC().

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC().

cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE().

cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC().

h264: add overread protection to get_cabac_bypass_sign_x86().

h264: reindent get_cabac_bypass_sign_x86().

h264: use struct offsets in get_cabac_bypass_sign_x86().

h264: fix overreads in cabac reader.

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

ass: fix aspect ratio computation.

wmall: fix seeking.

lagarith: fix buffer overreads.

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

dvdec: drop unnecessary dv_tablegen.h #include

dvdec.c uses nothing from dv_tablegen.h.  As a welcome side-effect, this
fixes compilation of that file with hardcoded tables enabled.

indeo4: Dont leave tables in random state on errors.

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

indeo4: apply correction to eob/esc indexes too

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

indeo4: Check for mismatching scan tables

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

build: fix doc generation errors in parallel builds

The $(dir) function used to construct OBJDIRS includes a trailing slash
in the names returned, which GNU make 3.82 does not match to the
slash-less 'doc' in the documentation dependencies, causing parallel
build to fail.  Adding a slash fixes this and still works with make
3.81.

Signed-off-by: Mans Rullgard <mans@mansr.com>

vc1dec: Fix global array overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

apedec: fix global array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Replace memset(0) by zero initializations.

Also remove one pointless zero initialization in rangecoder.c.

faandct: Remove FAAN_POSTSCALE define and related code.

It is not a user-accessible option and unlikely to ever be changed.

dvenc: print allowed profiles if the video doesn't conform to any of them.

avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size.

Otherwise realloc would free it, which would result in double free
later.

FATE: add a test for vp8 with changing frame size.

apedec: check bits <= 32

Fixes FPE

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

tm2dec: check total_frames and extradata_size.

Fixes overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fix compilation with hardcoded tables.

tm2: Fix overread of token array.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lzw(gif): Fix overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lagarith: Fix various issues that lead to out of array reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lagarith: fix flipped return value

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

lagarithrac: fix length used in ff_lag_rac_init()

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  westwood_vqa: fix SND0 chunk handling
  westwood_vqa: set video stream duration
  raw: forward avpicture_fill() error code in raw_decode().
  build: Do not explicitly add the doc directory to the OBJDIRS list.
  dv: Split off DV video decoder into its own file.
  build: fix RALF decoder standalone compilation, which depends on Golomb code
  configure: Drop stray duplicate entry for --disable-fft from help output.

Conflicts:
libavcodec/dv.c
libavcodec/rawdec.c
libavformat/westwood_vqa.c

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

h263dec: Restore w/h values to a consistent state if a change is rejected.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fate: add kgv1 fate test.

Tested to be bit-exact across x86-64, x86-32 and ppc.

id3v2: support JPEG APIC with incorrect (image/jpg) MIME type

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

Support FLIC in AVI.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: pause rdft column when ffplay is paused

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

oggdec: calculate correct timestamps in Ogg/FLAC

We need to parse the individual packet durations when there is more than one
packet in a page.

ffplay: pause rdft column when ffplay is paused

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

XBM decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

j2kdec: move ff_j2k_init_tier1_luts() to j2kdec_init()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Clarify the use of the interl=1|-1 option of the scale filter.

It is not entirely clear that whilst for width and height only an
expression needs to be provided, for interlace the option must
also be given.

It is also unclear that the default is non interlaced aware scaling.

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

alsdec: check return values.

westwood_vqa: fix SND0 chunk handling

Version from vqa header does not dictate which sound chunks may
appear in file.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

westwood_vqa: set video stream duration

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

raw: forward avpicture_fill() error code in raw_decode().

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

h264: dont mess with chroma planes for grayscale h264.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

alsdec: make sure no invalid opt_order stays in the context.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vc1dec: dont ignore ff_vc1_parse_frame_header_advs return value

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vc1dec: avoid == -1 checks for errors.

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

vc1dec: sanity check state used in get_mvdata_interlaced()

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

oma: dont over-read buffer

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  make av_interleaved_write_frame() flush packets when pkt is NULL
  mpegts: Fix dead error checks
  vc1: Do not read from array if index is invalid.
  targa: convert to bytestream2.
  rv34: set mb_num_left to 0 after finishing a frame

Conflicts:
libavcodec/targa.c
libavcodec/vc1data.c

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

build: Do not explicitly add the doc directory to the OBJDIRS list.

Now that a documentation generator is built in the doc directory,
this is no longer necessary.  Fixes the Make warning:
Makefile:188: target `doc' given more than once in the same rule.

dv: Split off DV video decoder into its own file.

build: fix RALF decoder standalone compilation, which depends on Golomb code

configure: Drop stray duplicate entry for --disable-fft from help output.

make av_interleaved_write_frame() flush packets when pkt is NULL

This patch allows the user to force flushing of all queued packets
by calling av_interleaved_write_frame() with pkt set to NULL.

Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Martin Storsjö <martin@martin.st>

doc: clarify dshow input requirements

j2kdec: remove pointless swapping

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

j2kdec: vertically align AVCodec members

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

j2kdec: Remove useless .pix_fmts.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

j2kdec: convert to bytestream2 API

Protects against overreads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

mpegts: Fix dead error checks

vc1: Do not read from array if index is invalid.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

targa: convert to bytestream2.

Also remove some write-only variables or write-only variable
assignments, remove internal colorspace conversion to native
endianness (that can be done by swscale much more efficiently),
and some cosmetics.

ffmpeg: fix handling or empty audio packets

Fixes Ticket1131

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

ffmpeg: more verbose error messages in case of audio encoding failure.

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

Revert "raw: move buffer size check up."

This reverts commit cc5dd632cecc5114717d0b90f8c2be162b1c6ee8.
The change was redundant, it has been fixed long ago (422e3a7)

Conflicts:

libavcodec/rawdec.c

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