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

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

Fixes CID1254668
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

This ensures that the CFLAGS and LDFLAGS are actually applied.
Fixes an incorrect change introduced with the clean-up in commit
cfcaf6b3.
Reviewed-by: NNicolas George <george@nsup.org>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'e2e07dba':
  mov: expand the list of parsed metadata tags

Conflicts:
	libavformat/mov.c

See: 543f3db9
See: dadf668dMerged-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NLukasz Marek <lukasz.m.luki2@gmail.com>

This test doesn't cover every possible issue with this function.
It covers options management only.
Signed-off-by: NLukasz Marek <lukasz.m.luki2@gmail.com>

* commit 'b704b648':
  mov: parse XMP metadata on demand

Conflicts:
	libavformat/isom.h
	libavformat/version.h

See: 054c506e

The default is left unchanged at enabled
We can change the default if people prefer but i do not want to do that
in a merge.
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '174c5fde':
  mov: parse @PRM and @PRQ metadata tags

Conflicts:
	libavformat/mov.c

See: f540851cMerged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '35384934':
  mov: cosmetics: reorder the list of tags

Conflicts:
	libavformat/mov.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '6fd91fa1':
  h264: increase MAX_SLICES to 32

The available sample decodes correctly before, but the reporter of the bug
claims that this change reduces artifacts. This is thus merged
If someone has samples that decode differently depending in the MAX_SLICES
value, please open a ticket on trac.
Also this change should be reverted if it turns out that the artifacts
that where seen had a different cause
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'd0b22405':
  vf_frei0r: do not increment string if it reached the end

See: 02a6ee51Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '90411b33':
  Allow reading of growing avi files (currently being written)

Conflicts:
	libavformat/avidec.c
	tests/ref/fate/cvid-partial

See: e42a3dd1Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '4843a9c7':
  dpx: always write the image offset

Conflicts:
	libavcodec/dpxenc.c
	tests/ref/lavf/dpx

See: 361319d0Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '250e077e':
  riff: Support decoding png in avi (ImageJ)

See: 3668168aMerged-by: NMichael Niedermayer <michaelni@gmx.at>

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

This fixes artifacts in the last pixel of rows with some widths and pixel formats
Found-by: NDominique Leroux <Dominique.Leroux@autodesk.com>
Tested-by: NDominique Leroux <Dominique.Leroux@autodesk.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes CID1257010
Reviewed-by: NLukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Based on L-Smash code by Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>.

add GET_VDST16() macro
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

The Extensible Metadata Platform tag can contain various kind of data
which are not strictly related to the video file, such as history of edits
and saves from the project file. So display XMP metadata only when the
user explicitly requires it.

Based on a patch by Marek Fort <marek.fort@chyronhego.com>.

These tags describe the product and quicktime library version respectively.
They originate from Adobe Premiere, but also some other programs use them.
Contrary to other tags, they contain 'raw' data which is not to be
interpreted as iso639 or mac strings.

Based on a patch by Peter Ross <pross@xvid.org>.

Alphabetically order the list by the tag to facilitate the insertion of
new ones.

H264 streams from CounterPath Bria and some Cisco phones need an
increased pool for correct decoding.

Bug-Id: 645
Sample-Id: bria-h264.mka

Bug-Id: 778
CC: libav-stable@libav.org

This uses the RIFF header stored size to figure out the expected AVI
file size, instead of the actual file. To work fully it requires handling
failed avio_seek() instead of assuming they always succeed.

Some fate file has been cut off and contains half a frame at the end which
previously was not output during demuxing. This frame is now output to
encoder, thus the fate diff update.

Bug-Id: 261
Signed-off-by: NVittorio Giovara <vittorio.giovara@gmail.com>

According to the DPX file format description found at
http://www.fileformat.info/format/dpx/egff.htm the ImageElement part of
the GenericImageHeader also contains an an offset to the real image data
beside the same member that can be found in the GenericFileHeader.

Libav keeps this member empty (=0) while some applications expects it to
be filled properly. FATE test updated accordingly.

Bug-Id: 742
Signed-off-by: NVittorio Giovara <vittorio.giovara@gmail.com>

* commit 'b280c620':
  arm: fft_vfp: Unify the behaviour in ff_fft_calc_vfp between arm/thumb
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'ae815764':
  arm: fft_vfp: Add a missing "endconst" when building in thumb mode
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '29bc7bfb':
  rtpproto: Write a warning if the input data written isn't RTP packetized
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Don't include the function pointer table in the code segment
in arm mode.

This shouldn't have any significant performance effect. It does
end up as a few more instructions than before, for ARM, but
only at the entry to this function, not within the fft functions
themselves.
Signed-off-by: NMartin Storsjö <martin@martin.st>

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

Tell the user that the RTP muxer needs to be used to packetize
the data - using the RTP protocol on its own isn't enough.
Signed-off-by: NMartin Storsjö <martin@martin.st>

Standalone compilation of the libx264rgb encoder does not work.

Fixes CID 1257012
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

This improves compatibility of such files with apple tools
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '6a880090':
  doc: Use the correct @subsection tag

See: cf3bfc97Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '4fd7e63c':
  mp3: Tweak the probe scores

Conflicts:
	libavformat/mp3dec.c

FFmpeg detects the file fine, and there is a non zero risk
that this change may lead to misdetections, thus not merged.
If someone has a mp3 file that is misdetected, please open a ticket
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '4f5906a1':
  latm: Do not give a score for a single instance

Conflicts:
	libavformat/rawdec.c

No change, the buggy case was not part of FFmpeg
Merged-by: NMichael Niedermayer <michaelni@gmx.at>