* commit '18e3d61e':
  h264: parse display orientation SEI message

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

* commit 'a54f03bf':
  display: add matrix flip api

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

* commit '33a7b453':
  doc: mention option to mix shared/static libraries
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0307cc22':
  rtpdec: pass an AVFormatContext to ff_parse_fmtp()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '650d3840':
  yuv4mpegenc: do not access AVCodecContext.coded_frame

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

* commit '27c1f82f':
  nsvdec: remove commented out cruft
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'edb1af7c':
  mov: free the dv demux context with avformat_free_context()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a14b6165':
  mtv: do not set sample_rate for video
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b8604a97':
  oggparsecelt: do not set AVCodecContext.frame_size

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

* commit 'd5cf5afa':
  adxdec: get rid of an avpriv function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f6ee61fb':
  lavc: export DV profile API used by muxer/demuxer as public

Conflicts:
	configure
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/dv_profile.c
	libavcodec/dv_profile.h
	libavcodec/version.h
	libavformat/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '3f3232a3':
  avconv: set the output stream timebase

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

* commit 'c9c1265c':
  avformat: update muxing doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'abda15a9':
  cdg: set the keyframe flag on the first packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Thanks-to: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Thanks-to: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The issue affects dvdsub subtitles (a.k.a. VOBSUB).

Some players -- in particular hardware players -- cut off
the lowest row of pixels if the number of rows in the subtitle
is odd.

The patch below implements a work-around for that.  If the
number of rows is odd, it is simply rounded up to an even
number, adding an invisible (i.e. fully transparent) row.
The work-around can be enabled or disabled with a new
option -even_rows_fix.  The default is disabled, so there
is no change of behaviour for users who don't care about it.

The overhead for the fix is low, and in many cases even zero:
For subtitles with an odd number of rows (i.e. in 50% of
cases on average), the size increases by two bytes because
a fully transparent row is encoded as 0x00 0x00.  However,
in the VOBSUB standard, all data packets are padded to 2KB
anyway, so in most cases the additional bytes just use some
part of the padding, so there is no overhead.  Only in the
rare case that the 2KB boundary is hit (0.1% chance), a full
2KB block is added.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes assertion failure with vdpau and vlc
Fixes Ticket3742

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

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

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

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

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

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Use it for logging, instead of NULL or the stream codec context.

Its contents are meaningful only if the stream codec context is the one
actually used for encoding, which is often not the case (and is
discouraged).

Use AVCodecContext.field_order instead.

It is supposed to be set by decoders only.

The only thing the demuxer needs is the sample rate to set the timebase,
which can be simply read with AV_RB32.

This is required by the new API.

The callers should now set the stream timebase, not the codec one.

Bug-Id: 55

Also support changing arrow head/tail shape
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes timestamps

Based-on: code from pulseaudio
Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>