gas-preprocessor and armasm fail otherwise

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

* commit '85b3b1c4':
  xcbgrab: Unbreak parsing filename options

Conflicts:
	libavdevice/xcbgrab.c

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

* commit 'b31328d0':
  xcbgrab: Provide better names for the y and x option

Conflicts:
	doc/indevs.texi
	libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'da7e5619':
  matroskaenc: Allow writing track "forced" flag

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

* commit 'd594dbec':
  rtpdec: Rename the free method to close
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8e32b1f0':
  libavformat: Use ffio_free_dyn_buf where applicable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '199fb402':
  rtpdec: Use ffio_free_dyn_buf

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

* commit '8a273a74':
  avio: Add an internal utility function for freeing dynamic buffers
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '078d43e2':
  rtpdec: Free depacketizers if the init function failed
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bb4a310b':
  rtpdec: Don't free the payload context in the .free function

Conflicts:
	libavformat/rtpdec_latm.c
	libavformat/rtpdec_mpeg4.c
	libavformat/rtpdec_mpegts.c
	libavformat/rtpdec_xiph.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f4b59334':
  rtpdec: Remove the now unused .alloc field
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '78791c08':
  rtpdec: Use .init instead of .alloc to set default values

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

* commit '88434f97':
  rtpdec: Remove unnecessary inline attributes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ec96a89c':
  rtpdec: Don't pass non-const pointers to fmtp attribute parsing functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ac0e54fd':
  rtpdec: Add const to string parameters in internal fmtp parsing functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '12251f99':
  rtpdec: Remove unnecessary checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c82bf15d':
  rtpenc: Merge the h264 and hevc packetizers

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

* commit '3567b91e':
  rtpdec_hevc: Share the implementation of fragmented packets with h264

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

* commit 'f3449062':
  rtpdec_hevc: Reduce indentation level by returning early on errors

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

* commit '8633fb47':
  rtpdec_hevc: Share the implementation of parsing a=framesize with h264

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

* commit '5956f489':
  rtpdec_hevc: Add asterisks at the start of each long comment line
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5d8cae45':
  rtpdec: Get rid of all trivial .alloc/.free functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e72605f8':
  rtpdec: Allow allocating and freeing the private data without explicit functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2b982e92':
  rtpdec: Set need_parsing via a handler field
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b7a4c319':
  rtpdec: Allow setting the need_parsing field in RTPDynamicProtocolHandler
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Incidentally `-y` also collides with avconv global options.

Update x11grab to match and document the option.

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

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

* commit 'b651c913':
  rtpdec_mpa_robust: Move .enc_name to the start of the struct
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'db158f0d':
  rtpdec: Remove unnecessary _if_needed suffixes on functions

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

* commit '353b492d':
  rtpdec: Change enc_name to a pointer instead of a fixed-size buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0752f700':
  rtpdec_h264: Remove an unnecessary include
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '247764a5':
  rtpdec_h264: Remove unnecessary struct padding
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fe414059':
  rtpdec_amr: Use the common indentation style
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Many of these functions were named foo_free_context, and since
the functions no longer should free the context itself, only
allocated elements within it, the previous naming was slightly
misleading.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

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

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

This is different from how it is handled in codecs/demuxers/muxers
though (where the close function isn't called if the open function
failed), but since the number of depacketizers that have an .init
function is quite limited, this is easy to change.

The main point is that if the init function failed, we shouldn't
try to use that depacketizer at all - this makes sure that the
parse function doesn't need to check for the things that were
initialized in the init function.
Signed-off-by: Martin Storsjö <martin@martin.st>