escape130: fix colors

escape130: remove trailing whitespace

rpl: enable escape130 codec

escape130: minimal effort to make it compile without warnings

Escape 130 (RPL) decoder

vc1_parser: fix NULL pointer dereference
Fixes Ticket456

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

Support ffmpeg -dn to disable copying data streams.

Fixes ticket #647.

h264: More restrictive more_rbsp_data_in_pps()
Fixes Ticket697

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

pictordec: prevent segfault when reading corrupted files

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

pictordec: use correct context for another av_log

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

ffmpeg: fix segfault with ffmpeg -h

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

ffmpeg: fix changing sample rate handling

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

lavf: allow grouping packets in chunks of a user specified size and duration.
This is similar to MP4Boxs -inter

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

lavf: add audio_preload option, this allows interleaving audio earlier

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

ffmpeg: factorize duration calculation in transcode_video()

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

ffmpeg: make copy_tb tri state so the user can select either timebase or
leave it at auto

Inspired-by a change from Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec: Templatize the code for different g726 bitrate variants
  rv40: move loop filter to rv34dsp context
  lavf: make av_set_pts_info private.
  rtpdec: Add support for G726 audio
  rtpdec: Add an init function that can do custom codec context initialization
  avconv: make copy_tb on by default.
  matroskadec: don't set codec timebase.
  rmdec: don't set codec timebase.
  avconv: compute next_pts from input packet duration when possible.
  lavf: estimate frame duration from r_frame_rate.
  avconv: update InputStream.pts in the streamcopy case.

Conflicts:
avconv.c
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/fbdev.c
libavdevice/libdc1394.c
libavdevice/oss_audio.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavformat/au.c
libavformat/eacdata.c
libavformat/flvdec.c
libavformat/mpegts.c
libavformat/mxfenc.c
libavformat/rtpdec_g726.c
libavformat/wtv.c
libavformat/xmv.c

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

BPP fix, YUVP9, 10, 16 support, make RGB24 default

Use correct context for av_log.

Fixes ticket #695.

movenc: replace cluster memset by zeroing only the needed field.

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

rtpdec: Templatize the code for different g726 bitrate variants

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

rv40: move loop filter to rv34dsp context

Signed-off-by: Mans Rullgard <mans@mansr.com>

lavc: Fix side data handling for audio decoders.

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

nellymoserdec: Use sidedata to support mid stream sample rate changes.

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

flvdemux: export flags for nellymoser through side data.

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

lavf: make av_set_pts_info private.

It's supposed to be called only from (de)muxers.

avfilter: align allocated images to 32 for AVX and IFF

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

lavc: horizontal align for IFF

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

ac3probe: Change threshold from 500 to 200 to keep in sync with mp3.

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

mp3probe: Detect mp3 stronger with just 200 frames, this should speed up detection
on mp3 streams.

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

rtpdec: Add support for G726 audio

This requires using a separate init function, since there
isn't necessarily any fmtp lines for this codec, so
parse_sdp_a_line won't be called. Incorporating it with the
alloc function wouldn't do either, since it is called before
the full rtpmap line is parsed (where the sample rate is
extracted).

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

rtpdec: Add an init function that can do custom codec context initialization

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

wmall: fix return type of dump_int_buffer()

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

movenc: memset(0) new cluster elements after realloc()

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

wmall: remove tabs that leaked in from a merge and seem to have
managed to silently bypass the push checks.

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

avconv: make copy_tb on by default.

I.e. on streamcopy set output codec timebase from input stream timebase
(as opposed to input codec timebase). This should be more sane, because
since the stream is not decoded, the input codec tb has no relation to
the timestamps of the copied packets.

matroskadec: don't set codec timebase.

It's not supposed to be set outside of lavc.

rmdec: don't set codec timebase.

It's not supposed to be set outside of lavc.
Set r_frame_rate instead.

avconv: compute next_pts from input packet duration when possible.

lavf: estimate frame duration from r_frame_rate.

If r_frame_rate is set, it should be more reliable for this than either
codec or stream timebase.

avconv: update InputStream.pts in the streamcopy case.

This was broken in 2a651b719c309c5e2fc663a5a9d6ca36153ab98f.

Fix typeo in some rarely used memoization

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

removes spurious warning

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo3: check per-plane data buffer against input buffer bounds.
  avconv: Handle audio sync for non-S16 sample formats.
  pthread: don't increment index on zero-sized packets.

Conflicts:
libavcodec/indeo3.c

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

ffmpeg.c use b:v for video bitrates using a target

it's more consistent to use -b:v instead of just -b

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

ffmpeg: do not use a negative total_size (AVERROR) in bitrate estimation.

Consistently use %ifdef ARCH_X86_64

One out of 3 places used ifndef, which is needlessly confusing.

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

indeo3: check per-plane data buffer against input buffer bounds.

Fixes : http://bugzilla.libav.org/show_bug.cgi?id=102

Signed-off-by: Alex Converse <alex.converse@gmail.com>

docs: Spelling fixes to 9 texi files from /doc

credits to: Violet Lin (from Google Code-in)

Signed-off-by: burek <burek021@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

faq.texi: fix spelling errors

credits to: Philip (from Google Code-in)
Signed-off-by: burek <burek021@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

developer.texi: fix spelling errors

credits to: KayC (from Google Code-in)
Signed-off-by: burek <burek021@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

general.texi: fix spelling errors

credits to: Samuel M (from Google Code-in)
Signed-off-by: burek <burek021@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavc: dont call set_dimensions() on h264 codec init.
This fixes ffprobe showing an incorrect width with
http://panda-test-harness-videos.s3.amazonaws.com/panda.mp4

Idea-by: Joakim Plate <elupus@ecce.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

swr: handle correctly muted channel with u8 sample fmt.

movenc: Remove unneeded chunkSize field from MOVIentry

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

avutil: revert project name messing

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

ac3enc: clenaup project name in one comment

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

avconv: Handle audio sync for non-S16 sample formats.

Also fix reporting of the number of samples added/dropped.

pthread: don't increment index on zero-sized packets.

The next call to decode() will update from an invalid index, which will
either lead to a memcpy() where dest==src (2 threads), or lead to a
crash (>2 threads).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

movenc: Write file with minimal number of chunks for the given interleaving.

Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  adtsenc: Check frame size.
  txd: Fix order of operations.
  APIchanges: fill in some blanks
  timer: fix misspelling of "decicycles"
  Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.
  indeo3: cosmetics
  md5proto: Fix order of operations.
  dca: Replace oversized unused get_bits() with skip_bits_long().

Conflicts:
doc/APIchanges
libavformat/mmsh.c

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

adtsenc: Check frame size.

Inspired by work from: Michael Niedermayer <michaelni@gmx.at>.

Signed-off-by: Alex Converse <alex.converse@gmail.com>

txd: Fix order of operations.

APIchanges: fill in some blanks

Signed-off-by: Mans Rullgard <mans@mansr.com>

ffv1dec: use PIX_FMT_0RGB32 when there is no transparency plane

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

ffv1dec: transparency plane support.

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

ffv1enc: PIX_FMT_0RGB32 support

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

ffv1enc: Store transparency plane.

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

timer: fix misspelling of "decicycles"

Signed-off-by: Mans Rullgard <mans@mansr.com>

huffyuvenc: switch from alphaless rgb32 to rgb24

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

ffprobe: print codec timecode if available.

mpeg12: raise timecode to codec context.

Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.

indeo3: cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>

sdp: Fix null pointer dereference with aac and ffserver.

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

huffyuvenc: support alphaless rgb32

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

huffyuvenc: store alpha for bgr32

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

swscale: alpha less rgb32 support.

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

pixfmt: Add 32bit rgb without alpha formats

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

md5proto: Fix order of operations.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vc1: use an enum for Frame Coding Mode
  doc: cleanup filter section
  indeo3: error out if no motion vector is set.
  x86inc: Flag shufps as an floating-point instruction for the AVX emulation code.
  mpegaudio: do not use init_static_data() for initializing tables.
  musepack: fix signed shift overflow in mpc_read_packet()
  mov: Make format string match variable type.
  wmavoice: Make format string match variable type.
  vc1: select interlaced scan table by FCM element
  Generalize RIFF INFO tag support; support reading INFO tag in wav
  pthread: track thread existence in a separate variable.

Conflicts:
doc/filters.texi
libavcodec/pthread.c
libavformat/avi.c
libavformat/riff.c
libavformat/riff.h
libavformat/wav.c

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

dca: Replace oversized unused get_bits() with skip_bits_long().

vc1: use an enum for Frame Coding Mode

Document it a little and possibly fix a bug in dxva2_vc1.

doc: cleanup filter section

Use the @command{} tag when needed and cleanup the examples.

x86inc: Flag shufps as an floating-point instruction for the AVX emulation code.

Without this, code like "shufps m0, m1, m2, 0xaa" would not work in CPUs
not supporting SSE2.

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

indeo3: error out if no motion vector is set.

This fixes a crash on a corrupt bitstream (bugzilla #93).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

x86inc: Flag shufps as an floating-point instruction for the AVX emulation code.

Without this, code like "shufps m0, m1, m2, 0xaa" would not work in CPUs
not supporting SSE2.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

aacenc: make the aac coder user choosable.

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

aacenc: add AAC_CODER_NB

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

cmdutils: pass AVCodec to filter_codec_opts()

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

mpegaudio: do not use init_static_data() for initializing tables.

It is called once for each mpegaudio codec that is registered, which adds
significant overhead.

img2: update first file only when -updatefirst is specified

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

tta: better check for totalframes.
Avoids crash, Fixes Ticket 690

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

img2: Allow writing multiple files onto the same output file.
Fixes Ticket687

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

musepack: fix signed shift overflow in mpc_read_packet()

Using an unsigned variable avoids problems with overflows.
There is further no need for a 64-bit intermediate here.

Signed-off-by: Mans Rullgard <mans@mansr.com>

pthread: check pthread_create() return value.

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

pthread: next try on freeing threads without crashing.
This should fix mingw

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

mov: Make format string match variable type.

wmavoice: Make format string match variable type.

vc1: select interlaced scan table by FCM element

Interlaced videos can contain progressive frames too and now wrong scantable
is selected for them.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>