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

* commit '1b891d17':
  avconv: fix bitrate report when writing to /dev/null
  avfilter: fix graphparser memleaks on error paths
  rawdec: remove ff_raw_read_header
  pcmdec: remove dependency from rawdec
  g722: refactor out of rawdec.c
  rawvideo: use a specific read_header

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

With the current implementation this is purely cosmetic

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

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

The code would crash after printing the warning

Fixes CID717903, CID717904
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

While here reindent .codec_tag .
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

Jump to the common release code in case of failure.

If the stats are printed when request_frame on the input
returns EOF, then they are never printed if the filter is
not flushed, in particular when using the -t ffmpeg option.

Fix trac ticket #1727.

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

By default, fps selects frames near PTS 0, 0.5, 1.5, 2.5, etc.
With round=down, it selects the frames near PTS 0, 1, 2, 3, etc.

Fixes null pointer dereference.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

While here remove redundant references in error message.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

avio_size() reports the filesize which returns 0 for /dev/null.
avio_tell() reports the current position.

Also handle errors from avio_tell().

Fixes CID700635, CID700636 and CID732274.

It is not used anymore and is a kludge.

The code shared is not actually shared with anything else.

ff_raw_read_header is used only for this demuxer for video.

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  avutil: Make LZO decoder code configure-time selectable
  avutil: Move memcpy_backptr() to mem.c
  configure: detect parisc64 automatically
  configure: detect ppc64 automatically
  configure: detect mips64 automatically
  configure: generalise 64-bit test
  smoothstreamingenc: Don't assume streams start from timestamp 0

Conflicts:
	configure
	libavutil/Makefile
	libavutil/lzo.c
	libavutil/lzo.h
	libavutil/mem.c
	libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The function is used elsewhere and does not belong with the LZO code.

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

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

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

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

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

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

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

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

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

We don't have a text encoder yet, so this commit makes automatic
encoding working with srt output.