Michael Niedermayer 30b491f1c9 Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e' ...

* commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e':
  movenc: Keep track of the allocated size for the cluster array
  mem: Add av_realloc_array and av_reallocp_array

Conflicts:
	doc/APIchanges
	libavformat/movenc.c
	libavutil/mem.c
	libavutil/mem.h
	libavutil/version.h

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

2013-06-05 11:19:16 +02:00

..

doxy

…

examples

examples/filtering_audio: fix frame leak.

2013-04-18 17:03:01 +02:00

APIchanges

Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e'

2013-06-05 11:19:16 +02:00

authors.texi

…

avtools-common-opts.texi

doc: document -opencl_options option in ff* tools manuals

2013-04-14 20:30:34 +02:00

avutil.txt

…

bitstream_filters.texi

…

build_system.txt

…

codecs.texi

doc: move ffmpeg-codecs.texi content to separated file

2013-04-05 10:11:57 +02:00

decoders.texi

…

default.css

…

demuxers.texi

img2dec: Add ts_from_file option

2013-05-25 11:42:28 +02:00

developer.texi

Merge commit '8e673efc6f5b7a095557664660305148f2788d30'

2013-05-19 10:53:39 +02:00

devices.texi

doc: move ffmpeg-devices.texi content to separated file

2013-04-05 10:11:57 +02:00

doxy-wrapper.sh

…

Doxyfile

Merge commit 'e69222c50755030eef921e899e38b71a111093d9'

2013-05-24 12:25:21 +02:00

encoders.texi

doc/encoders: add documentation for libtwolame

2013-06-05 08:33:13 +00:00

errno.txt

…

faq.texi

lavfi: deprecate aconvert.

2013-04-11 22:13:45 +02:00

fate_config.sh.template

Merge remote-tracking branch 'qatar/master'

2013-05-29 11:19:25 +02:00

fate.texi

doc: Mention the target_samples and ld variables for fate configs

2013-05-29 10:37:18 +03:00

ffmpeg-bitstream-filters.texi

…

ffmpeg-codecs.texi

doc: move ffmpeg-codecs.texi content to separated file

2013-04-05 10:11:57 +02:00

ffmpeg-devices.texi

doc: move ffmpeg-devices.texi content to separated file

2013-04-05 10:11:57 +02:00

ffmpeg-filters.texi

…

ffmpeg-formats.texi

doc: move ffmpeg-formats.texi content to separated file

2013-04-05 10:11:57 +02:00

ffmpeg-protocols.texi

…

ffmpeg-resampler.texi

doc: move ffmpeg-resampler.texi content to separated file

2013-04-05 10:11:57 +02:00

ffmpeg-scaler.texi

doc: move ffmpeg-scaler.texi content to separated file

2013-04-05 10:11:57 +02:00

ffmpeg-utils.texi

doc: merge syntax.texi, eval.texi and opencl.texi into utils.texi

2013-04-12 18:21:57 +02:00

ffmpeg.texi

Merge commit '481575d255195c6c2f32e04686b94de984ae78d4'

2013-05-08 12:07:56 +02:00

ffmpeg.txt

…

ffplay.texi

doc: remove all-components.texi, include its content verbatim

2013-04-25 11:19:53 +02:00

ffprobe.texi

doc: remove all-components.texi, include its content verbatim

2013-04-25 11:19:53 +02:00

ffprobe.xsd

ffprobe: remove deprecated frame "reference" field

2013-03-17 00:27:48 +01:00

ffserver.conf

…

ffserver.texi

doc: remove all-components.texi, include its content verbatim

2013-04-25 11:19:53 +02:00

filter_design.txt

doc: Consistently use 'frame rate' everywhere

2013-03-31 18:22:08 -04:00

filters.texi

lavfi/mp: remove mp=sab

2013-06-05 00:06:51 +02:00

formats.texi

doc: move ffmpeg-formats.texi content to separated file

2013-04-05 10:11:57 +02:00

general.texi

doc/general: update after e4e4add0e3

2013-06-04 21:43:59 +00:00

git-howto.texi

…

git-howto.txt

…

indevs.texi

v4l2: make possible to disable libv4l2 at runtime.

2013-05-22 19:49:29 +02:00

issue_tracker.txt

…

libavcodec.texi

…

libavdevice.texi

…

libavfilter.texi

…

libavformat.texi

…

libavutil.texi

doc/libavutil: remove include of opencl.texi

2013-04-12 18:21:57 +02:00

libswresample.texi

…

libswscale.texi

…

Makefile

doc/Makefile: install .3 man pages to man3 subdir

2013-05-19 19:26:25 +02:00

metadata.texi

…

mips.txt

mips: Optimization of AAC psychoacoustic model functions

2013-03-23 16:19:38 +01:00

multithreading.txt

Merge commit '759001c534287a96dc96d1e274665feb7059145d'

2013-03-12 03:23:28 +01:00

muxers.texi

Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521'

2013-05-03 13:16:34 +02:00

nut.texi

…

optimization.txt

…

outdevs.texi

lavd: add xv output device

2013-05-30 10:44:54 +02:00

platform.texi

Merge remote-tracking branch 'qatar/master'

2013-03-31 11:31:19 +02:00

print_options.c

Merge remote-tracking branch 'qatar/master'

2013-03-18 17:43:43 +01:00

protocols.texi

FTP protocol support

2013-05-18 22:16:02 +02:00

rate_distortion.txt

…

RELEASE_NOTES

doc: update release_notes by taking the ones from release/1.2

2013-03-19 16:21:26 +01:00

resampler.texi

swresample: set flags & description and add documentation for output_sample_bits

2013-06-04 21:57:25 +00:00

scaler.texi

doc: move ffmpeg-scaler.texi content to separated file

2013-04-05 10:11:57 +02:00

snow.txt

…

soc.txt

…

swresample.txt

…

swscale.txt

…

t2h.init

…

tablegen.txt

…

texi2pod.pl

doc/texi2pod.pl: skip printing chapter names if they are disabled

2013-03-30 16:58:45 +01:00

utils.texi

doc/utils: use @code markup for opencl function names.

2013-04-12 23:10:59 +02:00

viterbi.txt

…