diff options
| author | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-12-30 11:41:17 +0100 |
|---|---|---|
| committer | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-12-30 11:41:17 +0100 |
| commit | f70a623418a52eada0278002f8d266d49957b3d5 (patch) | |
| tree | fc54fd9fab400e886b11a9a2b313478b66dd7969 /docs | |
| parent | d5aaefa59f9ef4153644a2aa254c39a3a9d108e3 (diff) | |
| parent | d465188879cd4dd0735e3fbcaeb83d98f217ed88 (diff) | |
| download | gstreamer-plugins-bad-f70a623418a52eada0278002f8d266d49957b3d5.tar.gz | |
Merge remote-tracking branch 'origin/master' into 0.11-premerge
Conflicts:
docs/libs/Makefile.am
ext/kate/gstkatetiger.c
ext/opus/gstopusdec.c
ext/xvid/gstxvidenc.c
gst-libs/gst/basecamerabinsrc/Makefile.am
gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
gst-libs/gst/video/gstbasevideocodec.c
gst-libs/gst/video/gstbasevideocodec.h
gst-libs/gst/video/gstbasevideodecoder.c
gst-libs/gst/video/gstbasevideoencoder.c
gst/asfmux/gstasfmux.c
gst/audiovisualizers/gstwavescope.c
gst/camerabin2/gstcamerabin2.c
gst/debugutils/gstcompare.c
gst/frei0r/gstfrei0rmixer.c
gst/mpegpsmux/mpegpsmux.c
gst/mpegtsmux/mpegtsmux.c
gst/mxf/mxfmux.c
gst/videomeasure/gstvideomeasure_ssim.c
gst/videoparsers/gsth264parse.c
gst/videoparsers/gstmpeg4videoparse.c
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/libs/Makefile.am | 7 | ||||
| -rw-r--r-- | docs/libs/gst-plugins-bad-libs-docs.sgml | 1 | ||||
| -rw-r--r-- | docs/libs/gst-plugins-bad-libs-sections.txt | 35 |
3 files changed, 39 insertions, 4 deletions
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index cd3438778..016b843c8 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -49,22 +49,21 @@ extra_files = # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib # contains GtkObjects/GObjects and you want to document signals and properties. -GTKDOC_CFLAGS = -DGST_USE_UNSTABLE_API $(GST_PLUGINS_BAD_CFLAGS) $(GST_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) +GTKDOC_CFLAGS = -DGST_USE_UNSTABLE_API $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) GTKDOC_LIBS = \ $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la \ - $(GST_BASE_LIBS) $(GST_BAD_LIBS) + $(GST_BASE_LIBS) GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC) GTKDOC_LD=$(LIBTOOL) --tag=CC --mode=link $(CC) # If you need to override some of the declarations, place them in this file # and uncomment this line. -#DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt -DOC_OVERRIDES = +DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt include $(top_srcdir)/common/gtk-doc.mak diff --git a/docs/libs/gst-plugins-bad-libs-docs.sgml b/docs/libs/gst-plugins-bad-libs-docs.sgml index 0c9994160..cf6885b44 100644 --- a/docs/libs/gst-plugins-bad-libs-docs.sgml +++ b/docs/libs/gst-plugins-bad-libs-docs.sgml @@ -30,6 +30,7 @@ </para> <xi:include href="xml/gsth264parser.xml" /> <xi:include href="xml/gstmpegvideoparser.xml" /> + <xi:include href="xml/gstmpeg4parser.xml" /> <xi:include href="xml/gstvc1parser.xml" /> </chapter> diff --git a/docs/libs/gst-plugins-bad-libs-sections.txt b/docs/libs/gst-plugins-bad-libs-sections.txt index 92e620ac5..ca341d3e6 100644 --- a/docs/libs/gst-plugins-bad-libs-sections.txt +++ b/docs/libs/gst-plugins-bad-libs-sections.txt @@ -118,6 +118,41 @@ gst_mpeg_video_parse_quant_matrix_extension </SECTION> <SECTION> +<FILE>gstmpeg4parser</FILE> +<TITLE>mpeg4parser</TITLE> +<INCLUDE>gst/codecparsers/gstmpeg4parser.h</INCLUDE> +GstMpeg4StartCode +GstMpeg4VisualObjectType +GstMpeg4AspectRatioInfo +GstMpeg4ParseResult +GstMpeg4VideoObjectCodingType +GstMpeg4ChromaFormat +GstMpeg4VideoObjectLayerShape +GstMpeg4SpriteEnable +GstMpeg4Profile +GstMpeg4Level +GstMpeg4VisualObjectSequence +GstMpeg4VisualObject +GstMpeg4VideoSignalType +GstMpeg4VideoPlaneShortHdr +GstMpeg4VideoObjectLayer +GstMpeg4SpriteTrajectory +GstMpeg4GroupOfVOP +GstMpeg4VideoObjectPlane +GstMpeg4Packet +GstMpeg4VideoPacketHdr +gst_mpeg4_parse +gst_mpeg4_parse_video_object_plane +gst_mpeg4_parse_group_of_vop +gst_mpeg4_parse_video_object_layer +gst_mpeg4_parse_visual_object +gst_mpeg4_parse_visual_object_sequence +gst_mpeg4_parse_video_packet_header +<SUBSECTION Standard> +<SUBSECTION Private> +</SECTION> + +<SECTION> <FILE>gstphotography</FILE> GST_PHOTOGRAPHY_AUTOFOCUS_DONE GST_PHOTOGRAPHY_SHAKE_RISK |