Michael Niedermayer e7389ed5d0 Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b' ...

* commit 'bcc94328980e6c56546792ab08b0756abdce310b':
  opt: check the return values of av_get_token for ENOMEM.
  doc: Fix best_nb_channells typo
  matroska: pass the lace size to the matroska_parse_rm_audio

Conflicts:
	libavformat/matroskadec.c

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

2013-04-04 13:00:59 +02:00

..

doxy

…

examples

Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b'

2013-04-04 13:00:59 +02:00

APIchanges

lavu/samplefmt: add av_samples_alloc_array_and_pointers()

2013-03-31 18:00:44 +02:00

authors.texi

…

avtools-common-opts.texi

doc: Grammar fixes for strem specifiers section

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

avutil.txt

…

bitstream_filters.texi

doc: Fix some obsolete references to av* tools as ff* tools

2013-02-18 13:04:29 +01:00

build_system.txt

…

decoders.texi

…

default.css

…

demuxers.texi

doc: Consistently use 'frame rate' everywhere

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

developer.texi

Merge remote-tracking branch 'qatar/master'

2013-03-22 12:58:22 +01:00

doxy-wrapper.sh

…

Doxyfile

doxygen: dont strip code comments

2013-03-31 22:34:13 +02:00

encoders.texi

doc: Fix some obsolete references to av* tools as ff* tools

2013-02-18 13:04:29 +01:00

errno.txt

…

eval.texi

lavu/eval: add between() function.

2013-03-22 09:20:45 +01:00

faq.texi

doc: Consistently use 'filtergraph'

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

fate_config.sh.template

…

fate.texi

doc/fate.texi: fix typo

2013-04-03 21:07:15 +02:00

ffmpeg-bitstream-filters.texi

…

ffmpeg-codecs.texi

doc: Consistently use 'frame rate' everywhere

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

ffmpeg-devices.texi

…

ffmpeg-filters.texi

…

ffmpeg-formats.texi

lavf/mux: add the flush_packets option.

2013-03-24 23:19:07 +01:00

ffmpeg-protocols.texi

…

ffmpeg-resampler.texi

doc/resampler: fix two typo.

2013-02-14 23:43:08 +01:00

ffmpeg-scaler.texi

…

ffmpeg-utils.texi

…

ffmpeg.texi

doc: Grammar fixes for stream selection

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

ffmpeg.txt

…

ffplay.texi

doc: Consistently use 'filtergraph'

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

ffprobe.texi

doc/ffprobe: fix references in See Also section

2013-04-04 10:13:30 +02:00

ffprobe.xsd

ffprobe: remove deprecated frame "reference" field

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

ffserver.conf

…

ffserver.texi

doc: fix reference to ffmpeg-bitstream-filters.html page

2013-02-15 18:56:27 +01:00

filter_design.txt

doc: Consistently use 'frame rate' everywhere

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

filters.texi

doc/filters: fix error in blend description

2013-04-03 17:06:25 +00:00

general.texi

…

git-howto.texi

…

git-howto.txt

…

indevs.texi

doc: Consistently use 'frame rate' everywhere

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

issue_tracker.txt

…

libavcodec.texi

…

libavdevice.texi

…

libavfilter.texi

…

libavformat.texi

…

libavutil.texi

…

libswresample.texi

…

libswscale.texi

…

Makefile

…

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

lavf/segment: add support to ffconcat segment list

2013-03-07 01:44:59 +01:00

nut.texi

…

optimization.txt

…

outdevs.texi

doc: Fix some obsolete references to av* tools as ff* tools

2013-02-18 13:04:29 +01: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

doc: Fix some obsolete references to av* tools as ff* tools

2013-02-18 13:04:29 +01: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

snow.txt

…

soc.txt

…

swresample.txt

Fix a few "its" vs "it's" typo.

2013-02-14 23:45:48 +01:00

swscale.txt

…

syntax.texi

lavu/parseutils: allow MM:SS format for duration in av_parse_time()

2013-02-22 23:43:46 +01:00

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

viterbi.txt

…