Merge commit 'aae159a7cc4df7d0521901022b778c9da251c24e'

* commit 'aae159a7cc4df7d0521901022b778c9da251c24e':
  nuv: Do not ignore lzo decompression failures

Conflicts:
libavcodec/nuv.c
tests/ref/fate/nuv-rtjpeg

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

ffmpeg_filter: check that the input media type match the filter

Fixes Ticket2012

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

avcodec/gsmdec: reject unsupported msn audio modes

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

doc/filters: reformat scale filter doc

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

tiff: frame multithreading support

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/mpeg12dec: check slice size before trying to decode it

Fixes assertion failure

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

Update my email address.

riff: add msn audio comment

avcodec: free priv_data in avcodec_copy_context()

Fixes memleak
Fixes Ticket2216

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

ffserver: allocate rc_eq, prevent freeing invalid pointer

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

avcodec: clarify documentation of avcodec_copy_context()

Following this is not strictly needed but safes some malloc+free

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

lavfi/ebur128: fix typo: s/negociation/negotiation

Signed-off-by: Paul B Mahol <onemda@gmail.com>

nuv: Do not ignore lzo decompression failures

Update the fate reference since the last broken frame is not decoded
anymore.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

MAINTAINERS: add myself as maintainer for MIPS and Zeljko Lukac as maintainer for new fixed point FFT

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/riff: treat msn audio like gsm_ms

Fixes decoding of 4 files from Ticket2854

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  png: allow encoding 16-bit grayscale

Conflicts:
libavcodec/pngenc.c

See: fdc013da7863190b9416d45830a9ad6d7fb854c2

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

png: allow encoding 16-bit grayscale

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

Remove FF_API_PKT_DUMP cruft. Not compiled since libavformat 54.

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

libavformat/version.h: Drop FF_API_OLD_AVIO (unused and undefined since libavformat 55)

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

avcodec/mjpegdec: Read EXIF metadata in JPEG input.

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

avcodec: Add EXIF metadata parser to libavcodec.

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

avcodec/tiff: Refactor TIFF tag related functions to share the code.

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

avformat/asfdec: call ff_read_frame_flush() in asf_read_pts()

flushing just the asf demuxer but not the cores buffers leads to inconsistencies
and a "random" packet position which later causes an assertion failure

Fixes Ticket2853

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

libavutil/opt.h: Fix duplicate words

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

libavutil/file_open.c: Fix duplicate words

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

libavcodec/xsubenc.c: Fix duplicate words

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

libavcodec/rv40.c: Fix duplicate words

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

libavcodec/mpegvideo.h: Fix duplicate words

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

libavcodec/lpc.h: Fix duplicate words

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

libavcodec/dv.c: Fix duplicate words

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

libavcodec/bintext.h: Fix duplicate words

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

libavcodec/bink.c: Fix duplicate words

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

libavcodec/avcodec.h: Fix duplicate words

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

libavcodec/ac3tab.c: Fix duplicate words

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

libavcodec/ac3enc_template.c: Fix duplicate words

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

doc/filters.texi: Fix duplicate words

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

doc/filter_design.txt: Fix duplicate words

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

pixfmt: extend description for planar YUV 9/10 bits formats

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

img2dec: fix typo (double "with with")

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

ffmpeg_filter: do not pick evil path for trim filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi/trim: check for right default value

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wmall: use AVFrame API properly

Conflicts:
libavcodec/wmalosslessdec.c

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

Fix wrong use of "an" in some comments.

avcodec: Remove ff_packet_free_side_data, use av_packet_free_side_data

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

ape: check avio_read() return value

This sets pkt->size to absurd values on failure otherwise.

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

wmall: use AVFrame API properly

This fixes a bug with non-refcounted callers resulting in invalid memory access.

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Make new VDPAU easier to use by adding context to callback.

Using VDPAU correctly means checking for preemption
and possibly regenerating the context all the time.
With the current API there is no context or other
user-defined pointer and thus this in not possible
during decoding unless using some hack like global
variables.
The need to reinitialize both surfaces and even function
pointers makes handling preemption even more difficult.
This patch introduces a new render2 function that gets
both the AVCodecContext and AVFrame in addition,
in both the user can store additional opaque data.
This allows even advanced approaches like keeping a
"generation counter" for the surfaces so they can be
regenerated on the fly and efficiently.
In addition, the function has a return value that will
be passed through all the way instead of being silently
ignored as for the current render function.
Unfortunately the HWAccel API has no way of providing
API/ABI compatibility, so a currently disallowed
state (render pointer being NULL) is used to extend it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

vdpau: Add an allocation function for AVVDPAUContext.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

vdpau_internal.h: Add missing include for FF_API_BUFS_VDPAU.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

sanm: fix undefined behaviour on big-endian.

A variable with post-increment may only appear
once in a statement.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

tiff: continue parsing on non fatal errors

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

mpeg4videodec: Parse newpred headers

This is untested due to lack of a non broken file using new pred

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

mpeg4videodec: check resolution marker bits

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

avutil/avstring: make const tables static const

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

avutil/parseutils:make const tables static const

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

avutil/ripemd:make const tables static const

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

avutil/xtea: make const tables static const

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

avutil/sha:make const tables static const

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

avutil/sha512: make const tables static const

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

avformat/id3v2enc: use UTF-16 in id3v2.3 APIC frame only if non-ASCII

This makes the encoding of picture descriptions consistent with the
encoding of other text id3 tags and works better with iTunes, which
does not display pictures with some UTF-16 picture descriptions
(including a UTF-16 empty string, i.e. BOM + terminator).  It also
saves a few bytes.

Example:
 ffmpeg -f lavfi -i sine=b=4 -f lavfi -i smptebars -map 0:a -map 1:v \
   -codec:a libmp3lame -codec:v mjpeg -id3v2_version 3 \
   -metadata:s:v comment="Cover (front)" -t 3 -y out.mp3

This example does not set a picture description (-metadata:s:v title=)
so an empty string is written in the id3v2.3 APIC frame.  Without this
patch, UTF-16 is used and the cover art does not display in iTunes.
With the patch the cover art is displayed.  (Note that iTunes does not
display or have a way to set picture descriptions, only the picture
itself, but nevertheless has trouble skipping some UTF-16 descriptions.)

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Do not misuse memcmp

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

Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'

* commit '205a4502d3da9de2db75d2c965c9d065574e9266':
  doc: Clarify the avconv section about -re

Conflicts:
doc/ffmpeg.texi

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

Merge commit 'd175a5730b42166704b7262b33f4b780d9d92f60'

* commit 'd175a5730b42166704b7262b33f4b780d9d92f60':
  doc: Add an example on publishing over RTMP
  doc: Add librtmp to the section header for the librtmp specific details

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

Merge commit 'a435ca5b4d9efebf0759220681010977c36615f7'

* commit 'a435ca5b4d9efebf0759220681010977c36615f7':
  doc: Explain that the default RTMP user agent is different when publishing

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

Merge commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec'

* commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec':
  doc: Extend the rtmp example to include how to pass username/password

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

Merge commit '8e1fe345577a42f99591caf8a06c447613449694'

* commit '8e1fe345577a42f99591caf8a06c447613449694':
  rtmp: Detect and warn if the user tries to pass librtmp style parameters

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

Merge commit 'ba5393a609c723ec8ab7f9727c10fef734c09278'

* commit 'ba5393a609c723ec8ab7f9727c10fef734c09278':
  rtmp: rename data_size to size

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

Merge commit '4ebc7d659f0da6c1305ca08cf4303959203fff4b'

* commit '4ebc7d659f0da6c1305ca08cf4303959203fff4b':
  rtmp: Use PRId64 when needed.

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

avcodec/avpacket: Fix memory allocation failure check

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

Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d'

* commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d':
  lavc: Add refcounted api to AVPacket

Conflicts:
libavcodec/avpacket.c
libavcodec/version.h

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

Merge commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e'

* commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e':
  h264: check one context_init() allocation

Conflicts:
libavcodec/h264.c

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

Merge commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598'

* commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598':
  h264: use explicit variable names for *_field_flag

Conflicts:
libavcodec/h264.c

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

svq3: Fix ff_h264_check_intra_pred_mode() return code check

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

Merge commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714'

* commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714':
  h264: return meaningful values

Conflicts:
libavcodec/h264.c

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

rtmp: Do not misuse memcmp

CC: libav-stable@libav.org

lavu: fix grammar in doxy for av_frame_ref.

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

lavd: Fix make checkheaders

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

bprint: Include va_copy compat

Fixes build with MSVC and ICL.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

tests/fli: avoid rounding errors in -t option.

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

avutil/opt: make const tables static const

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

avutil/opt: fix av_log type

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

avformat/tedcaptionsdec: make const arrays static const

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

avfilter/f_sendcmd: make const arrays static const

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

avutil/log: Use bprint for part

This should fix the issue with strings longer than 1024

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

doc: Clarify the avconv section about -re

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

doc: Add an example on publishing over RTMP

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

doc: Explain that the default RTMP user agent is different when publishing

The fact that a different user agent is used is cruicial for getting
publishing authentication working. (When using librtmp, this other
user agent has to be specified manually, but that's not needed
with the libavformat internal RTMP support.)

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

doc: Extend the rtmp example to include how to pass username/password

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

doc: Add librtmp to the section header for the librtmp specific details

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

rtmp: Detect and warn if the user tries to pass librtmp style parameters

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

avutil/bprint: add av_vbprintf()

Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

rtmp: rename data_size to size

rtmp: Use PRId64 when needed.

lavc: Add refcounted api to AVPacket

Provide a clean way to manipulate packets.

h264: check one context_init() allocation

Signed-off-by: Anton Khirnov <anton@khirnov.net>

h264: use explicit variable names for *_field_flag

Signed-off-by: Anton Khirnov <anton@khirnov.net>

h264: return meaningful values

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libavutil: Make avpriv_open a library-internal function on msvcrt

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

Merge commit 'a76d0cdf21c3d9e464623cc0ad1c005abf952afa'

* commit 'a76d0cdf21c3d9e464623cc0ad1c005abf952afa':
  libavutil: Move avpriv_open to a new file, file_open.c

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

Merge commit 'cb0244daaca83ab666798818f74f5181bf6bc387'

* commit 'cb0244daaca83ab666798818f74f5181bf6bc387':
  bktr: Changed a missed occurrance of open into avpriv_open

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