diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 02:30:20 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 02:30:20 +0300 |
| commit | e73b3dba3e8084eb7141c2a8e27fba4950f2ba60 (patch) | |
| tree | 7801d9883ec0592c24b9a21264420efc58039387 /doc/Makefile | |
| parent | 2ab3088dda31103351eb839f2d53674dc2936a97 (diff) | |
| parent | 990e4a6639d0714198583c2812b1074b5751898f (diff) | |
Merge commit '990e4a6639d0714198583c2812b1074b5751898f'
* commit '990e4a6639d0714198583c2812b1074b5751898f':
Add a QSV decoding example.
Conflicts:
configure
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/Makefile')
| -rw-r--r-- | doc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/Makefile b/doc/Makefile index 745576cbf9..697142f088 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -46,6 +46,7 @@ DOC_EXAMPLES-$(CONFIG_FILTERING_AUDIO_EXAMPLE) += filtering_audio DOC_EXAMPLES-$(CONFIG_FILTERING_VIDEO_EXAMPLE) += filtering_video DOC_EXAMPLES-$(CONFIG_METADATA_EXAMPLE) += metadata DOC_EXAMPLES-$(CONFIG_MUXING_EXAMPLE) += muxing +DOC_EXAMPLES-$(CONFIG_QSVDEC_EXAMPLE) += qsvdec DOC_EXAMPLES-$(CONFIG_REMUXING_EXAMPLE) += remuxing DOC_EXAMPLES-$(CONFIG_RESAMPLING_AUDIO_EXAMPLE) += resampling_audio DOC_EXAMPLES-$(CONFIG_SCALING_VIDEO_EXAMPLE) += scaling_video |