Michael Niedermayer f5f3684fb8 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  lavf: simplify is_intra_only() by using codec descriptors.
  lavc: add an intra-only codec property.
  lavc: add codec descriptors.
  lavc: fix mixing CODEC_ID/AV_CODEC_ID in C++ code.
  dict: move struct AVDictionary definition to dict.c
  dict: add av_dict_count()

Conflicts:
	doc/APIchanges
	libavcodec/old_codec_ids.h
	libavformat/utils.c
	libavutil/version.h

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

2012-08-11 15:01:45 +02:00

..

doxy

…

examples

Merge remote-tracking branch 'qatar/master'

2012-08-09 00:51:02 +02:00

APIchanges

Merge remote-tracking branch 'qatar/master'

2012-08-11 15:01:45 +02:00

avtools-common-opts.texi

doc/avtools-common-opts: fix a few typos in the "Stream specifiers" section

2012-07-20 12:56:28 +02:00

avutil.txt

…

bitstream_filters.texi

Merge remote-tracking branch 'qatar/master'

2012-02-25 04:00:43 +01:00

build_system.txt

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

decoders.texi

…

demuxers.texi

lavf/img2dec: add and document pattern_type option

2012-08-08 23:43:36 +02:00

developer.texi

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

encoders.texi

doc/encoders: update libvpxenc mappings

2012-06-13 11:33:00 +02:00

errno.txt

…

eval.texi

Merge remote-tracking branch 'qatar/master'

2012-07-04 21:03:28 +02:00

faq.texi

faq: suggest the concat filter.

2012-07-28 18:16:55 +02:00

fate.texi

doc/fate: Rework examples to a section of its own

2012-07-05 10:55:49 +02:00

ffmpeg.texi

Merge remote-tracking branch 'qatar/master'

2012-08-09 19:31:56 +02:00

ffmpeg.txt

Fix "ouput" typo and add a check.

2012-01-28 11:04:19 +01:00

ffplay.texi

doc: add syntax.texi file

2012-05-22 00:39:53 +02:00

ffprobe.texi

ffprobe: add -show_data option.

2012-06-18 09:38:36 +02:00

ffprobe.xsd

ffprobe: fix validity error with tags and data.

2012-07-31 15:06:57 +02:00

ffserver.conf

Merge remote-tracking branch 'qatar/master'

2012-02-10 01:20:07 +01:00

ffserver.texi

…

filter_design.txt

doc/filter_design: fix a few typos

2012-07-22 12:16:18 +02:00

filters.texi

lavfi: add asetpts audio filter

2012-08-09 01:03:05 +02:00

general.texi

doc/general: move ZeroCodec to right section

2012-08-08 14:16:51 +00:00

git-howto.texi

Merge remote-tracking branch 'qatar/master'

2012-07-24 21:15:57 +02:00

git-howto.txt

…

indevs.texi

doc/indevs: document missing options in x11grab section

2012-08-08 23:43:37 +02:00

issue_tracker.txt

…

Makefile

doc/Makefile: invoke perl to interpret texi2pod.pl

2012-08-10 23:14:57 +02:00

metadata.texi

…

mips.txt

doc: add documentation regarding MIPS optimizations

2012-07-03 22:06:10 +02:00

multithreading.txt

…

muxers.texi

lavf/segment: add -segment_time_delta option

2012-07-10 00:53:01 +02:00

optimization.txt

…

outdevs.texi

lavd/caca: rename "colors" option to "color"

2012-07-22 10:31:33 +02:00

platform.texi

Merge remote-tracking branch 'qatar/master'

2012-08-10 16:25:23 +02:00

print_options.c

print_options: warn that the files are generated.

2012-04-23 18:14:25 +02:00

protocols.texi

Merge remote-tracking branch 'qatar/master'

2012-08-09 00:51:02 +02:00

rate_distortion.txt

…

RELEASE_NOTES

release_notes: update

2012-05-25 17:27:40 +02:00

snow.txt

…

soc.txt

…

swresample.txt

cosmetics: fix some typos

2012-03-13 01:14:04 +01:00

swscale.txt

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

syntax.texi

doc/syntax: escape '@' to fix a warning.

2012-05-29 07:40:58 +02:00

t2h.init

doc: declare encoding for texi2html.

2012-07-22 12:48:57 +02:00

tablegen.txt

…

texi2pod.pl

doc: texi2pod: add -I flag

2012-03-20 11:10:25 +00:00

viterbi.txt

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00