arm: cosmetics: Reindent the h264dsp neon init function

Signed-off-by: Martin Storsjö <martin@martin.st>
arm: Remove a leftover define for the pld instruction

This file no longer uses the pld instruction at all, all such uses
have been split into hpeldsp_arm.S.

Signed-off-by: Martin Storsjö <martin@martin.st>
arm: Allow overriding the alignment set in the function macro

The function macro always sets .align 2 before declaring the
function label (since 5c5e1ea3) and always sets the section to
.text (since 278caa6a).

The .align 5 before certain functions, added in fc252eba, were added
before .text and .align were added to the function macro and thus
became useless/unused when the function macro got them.

This restores the original intention, to align the loop entry
points.

Signed-off-by: Martin Storsjö <martin@martin.st>
arm: Add a missing # as prefix for an immediate constant

Signed-off-by: Martin Storsjö <martin@martin.st>
Merge commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f'

* commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f':
  arm: cosmetics: Reindent the h264dsp neon init function

Conflicts:
	libavcodec/arm/h264dsp_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0'

* commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0':
  arm: Remove a leftover define for the pld instruction

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69'

* commit '5dae4872357613a0b51120b54a4c5221e0ec3f69':
  arm: Allow overriding the alignment set in the function macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Add a missing # as prefix for an immediate constant

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/muxers/matroska: reformat documentation
doc/ffmpeg: remove documentation for removed vlang/slang options
doc/muxers/matroska: add information to the matroska metadata language entry
doc/muxers/image2: document strftime option

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
doc/muxers/image2: apply several formatting changes
avcodec/huffyuvenc: fix -context 1 encoding

Fixes Ticket3281

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avisynth: More av_new_packet changes

These are the remaining av_packet-related bits from 9eac7c4
that didn't get merged at that time.

Changes authored by Anton Khirnov <anton@khirnov.net>, split out
from 9eac7c4 by Stephen Hutchinson <qyot27@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avisynth: Use av_packet_from_data instead of av_new_packet

If the audio changes from 9eac7c4 were merged as they were, this
would cause scripts with both video+audio to fail with a lot of
audio decoding errors (the video would be fine). Scripts with
only one of either video or audio were unaffected. Additionally,
the av_packet changes in general caused seeking to break.

Using av_packet_from_data allows video+audio scripts to work as
expected, without audio decoding errors.  It also fixes seeking.

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