avcodec/mpegvideo: small indent fix in vismv code
transcoding: fix Doxygen file path

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/mpegvideo_enc: fix b frame strategy 2

Fixes Ticket3757

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'

* commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94':
  dsputil: Split off *_8x8basis to a separate context

Conflicts:
	libavcodec/dsputil.c
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/dsputilenc_mmx.c

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

* commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d':
  dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc

Conflicts:
	libavcodec/dsputil.c
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/dsputilenc.asm
	libavcodec/x86/dsputilenc_mmx.c

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

* commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b':
  dsputil: Move draw_edges() to mpegvideoencdsp

Conflicts:
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/cljrdec: remove unneeded include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
vmd: Split audio and video decoder

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'

* commit '246f869590b8c7313d26e1c2ef56db01f6fd2503':
  vmd: Split audio and video decoder

Conflicts:
	libavcodec/vmdvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
smoothstreamingenc: Fix a memory leak on errors

Signed-off-by: Martin Storsjö <martin@martin.st>
libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream

For implicit signaling cases (as possible for Spectral Band Replication
and Parametric Stereo Tools), the decoder must decode the first frame to
correctly identify the stream configuration (as called from
avformat_find_stream_info). The mechanism for this is built-in and only
requires adding CODEC_CAP_CHANNEL_CONF to the libfdk-aacdec AVCodec
struct.

Signed-off-by: Omer Osman <omer.osman@iis.fraunhofer.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
avutil/bprint: Add av_bprint_fd_contents()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avdevice/lavfi: allow non-mmappable files for graph_file

Use av_bprint_fd_contents() instead of av_file_map()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
dsputil: Split off FDCT bits into their own context
avformat/segment: Support cutting at clocktime

Signed-off-by: Deti fliegl <fliegl@baycom.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/segment: simplify localtime* use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/vmdvideo: remove unneeded include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc'

* commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc':
  smoothstreamingenc: Fix a memory leak on errors

See: a53c5d454ee608fd539e5c02ade3f246470d1cb2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d'

* commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d':
  libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/Doxyfile: use 5 columns for alphabetical index

This reverts a hunk from 671005558a295945f5d4cfd1abca6832af479c0b
Reduces diff to what we use on the server
Suggested-by: Timothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>