* qatar/master:
  ituh263: reject b-frame with pp_time = 0

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

Sandy Bridge Win64:
180 cycles on ff_synth_filter_inner_sse2
150 cycles on ff_synth_filter_inner_avx
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

this minimizes the amount of protocol seeks and reading needed in that case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This reduces the number of protocol seeks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Avoid a division by 0 in ff_mpeg4_set_one_direct_mv.

Sample-Id: 00000168-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

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

Build only on x86_32 targets.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

HLS: Handle the case when hls_list_size=0. Playlist file should contain all the segments. Fixes bug #3376.
Signed-off-by: Senthilnathan M <senthil.codr@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  qt-faststart: Add a note about the -movflags +faststart feature

Conflicts:
	tools/qt-faststart.c

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

* commit 'ea7f79f9':
  qt-faststart: Avoid unintentionally sign extending BE_32

See: 582f36ca
See: 69ce34c7Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bb95334c':
  qt-faststart: Check offset_count before reading from the moov_atom buffer

Conflicts:
	tools/qt-faststart.c

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

* commit '63848854':
  qt-faststart: Check the ftello() return codes

Conflicts:
	tools/qt-faststart.c

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

* commit '03c2a66f':
  qt-faststart: Fix the signedness of variables keeping the ftello return values

Conflicts:
	tools/qt-faststart.c

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

* commit '56122443':
  qt-faststart: Check fseeko() return codes

Conflicts:
	tools/qt-faststart.c

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

* commit 'ea15a9a5':
  qt-faststart: Simplify code by using a MIN() macro

Conflicts:
	tools/qt-faststart.c

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

* commit '3cbc7ef3':
  qt-faststart: Increase the copy buffer size to 64 KB

Conflicts:
	tools/qt-faststart.c

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

* commit 'd1f9563d':
  pthread_frame: flush all threads on flush, not just the first one
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bc6461c2':
  af_compand: replace strtok_r() with av_get_token()

Conflicts:
	configure
	libavfilter/af_compand.c

Not merged as requested by ubitux
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fb3b2f5d':
  configure: Set the thread type after resolving dependencies

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

* commit '2f02bbcc':
  build: Let the ffvhuff decoder/encoder depend on the huffyuv decoder/encoder

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

* commit '34150be5':
  build: Let the iac decoder depend on the imc decoder

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

* commit '8e0cf39f':
  build: Let all MJPEG-related decoders depend on the MJPEG decoder

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

* commit '0a36988e':
  build: Let AMV decoder depend on the SP5X decoder

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

* commit 'f4bd9fe3':
  h264: fix clang warning about uninitialized variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '17a63ff0':
  h264: update flag name in ff_h264_decode_ref_pic_list_reordering()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ee6280ca':
  h264: parse two additional constraint flags

Conflicts:
	libavcodec/h264_ps.c

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

* commit 'e70ab7c1':
  h264: add MVCD to the list of High profiles in SPS
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

The new function has the ability to allocate the structure, allowing it to grow
without needing major bumps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This structure is used in the interface between libs and thus cannot have
fields added in the middle without major bump
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is neccessary for maintaining ABI compatibility with FFmpeg 2.1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Without this cast, the BE_32() expression is sign extended when
assigned to an uint64_t, since the uint8_t|uint8_t expression
is promoted to an int.

Also avoid undefined behaviour when left shifting an uint8_t
by 24 by casting it to an uint32_t explicitly before shifting.

Based on a patch by Michael Niedermayer.
Signed-off-by: Martin Storsjö <martin@martin.st>

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

This silences a warning in the coverity static analyzer.
Signed-off-by: Martin Storsjö <martin@martin.st>

These variables are assigned the return values of ftello, which
returns an off_t, which is a signed type. On errors, ftello returns
-1, thus make sure this error return value can be stored properly.
Signed-off-by: Martin Storsjö <martin@martin.st>

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