* commit '312a9ef0':
  pixfmt: Update documentation with prefixed pixel formats

Conflicts:
	libavutil/pixfmt.h

See: 231e33f0Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '592a0405':
  pixdesc: Replace a few leftover instances of non AV-prefixed flags

Conflicts:
	libavutil/pixdesc.c

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

* commit '7419b348':
  fate: Add test for tscc2 in mov
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e4fe535d':
  mov: Write the display matrix in order

Conflicts:
	libavformat/mov.c
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Rename the existing tscc2 test.

This will allow to copy the matrix as is and it is just cleaner to keep
the matrix in the same order specified by the mov standard (which is
also explicitly described in the documentation).

In order to preserve compatibility, flip the angle sign in the display API
av_display_rotation_set() and av_display_rotation_get(), and improve the
documentation mentioning the rotation direction.

* commit 'e0046bc9':
  movenc: Write the make and model metadata keys for mov style files

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

This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Fixes Ticket #4384
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The initial spaces get ignored anyway so let's be consistent with other docs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

These are essential allowing QuickTime to keep detecting content
as slow-motion - this allows preserving them on stream copy.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

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

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

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

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

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

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

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

This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This commit has no known use case ATM as there are no unsupported video codecs in flv and could
theoretically be use to generate broken files allthough that would be not entirely easy as
tags/codecs still get sanity checked

This reverts commit 76f4b117.

This allows stream copying video codecs before they are explicitly
supported. The same feature was in the past useful for audio codecs
in flv

This partly reverts the changes from 735ab7c5Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This basically switches to the implementation from f6f7d150
which seems faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

7966 -> 7897 decicycles

This basically switches to the implementation from f6f7d150
which seems faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cfe64613':
  avfilter: Document avfilter_graph_alloc return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '27aa1ff3':
  oggdec: Check memory allocation

Conflicts:
	libavformat/oggdec.c

See: 9b8152bf an others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '93c1b04a':
  mms: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd450cb07':
  avplay: Check memory allocation

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

* commit 'd3aa307d':
  rmenc: Check memory allocation

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

* commit '7ebb3022':
  swscale: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

previously they where only updated when decoding started and would thus have
been inconsistent for a longer period of time leaving more chances for
problems
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>