virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  configure: Enable hwaccels without external dependencies by default.
  doc/developer: Clarify symbol naming prefixes section.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-22 12:52:05 +01:00
commit abbc34c372
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -2199,6 +2199,9 @@ enable safe_bitstream_reader
enable static enable static
enable swscale_alpha enable swscale_alpha
# By default, enable only those hwaccels that have no external dependencies.
enable dxva2 vdpau
# build settings # build settings
SHFLAGS='-shared -Wl,-soname,$$(@F)' SHFLAGS='-shared -Wl,-soname,$$(@F)'
FFSERVERLDFLAGS=-Wl,-E FFSERVERLDFLAGS=-Wl,-E

13
doc/developer.texi
View File

@ -157,13 +157,16 @@ There are the following conventions for naming variables and functions:
@item @item
For local variables no prefix is required. For local variables no prefix is required.
@item @item
For variables and functions declared as @code{static} no prefix is required. For file-scope variables and functions declared as @code{static}, no prefix
is required.
@item @item
For variables and functions used internally by a library an @code{ff_} For variables and functions visible outside of file scope, but only used
prefix should be used, e.g. @samp{ff_w64_demuxer}. internally by a library, an @code{ff_} prefix should be used,
e.g. @samp{ff_w64_demuxer}.
@item @item
For variables and functions used internally across multiple libraries, use For variables and functions visible outside of file scope, used internally
@code{avpriv_}. For example, @samp{avpriv_aac_parse_header}. across multiple libraries, use @code{avpriv_} as prefix, for example,
@samp{avpriv_aac_parse_header}.
@item @item
Each library has its own prefix for public symbols, in addition to the Each library has its own prefix for public symbols, in addition to the
commonly used @code{av_} (@code{avformat_} for libavformat, commonly used @code{av_} (@code{avformat_} for libavformat,