* qatar/master: avs: call release_buffer() at the end. Add minor bumps and APIchanges entries for lavc/lavfi changes. mpegvideo.c: K&R formatting and cosmetics. avconv: avoid memcpy in vsrc_buffer when possible. avconv: implement get_buffer()/release_buffer(). lavfi: add a new function av_buffersrc_buffer(). lavfi: add avfilter_copy_frame_props() lavc: add format field to AVFrame lavc: add width and height fields to AVFrame lavc: add a sample_aspect_ratio field to AVFrame doxy: add website-alike style to the html output FAQ: add an entry for common error when using -profile Conflicts: avconv.c cmdutils.c doc/APIchanges libavcodec/avcodec.h libavcodec/mpegvideo.c libavcodec/utils.c libavcodec/version.h libavfilter/Makefile libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/src_movie.c libavfilter/vsrc_buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>pull/3/head
Michael Niedermayer
13 years ago
commit
484e59a0a0
19 changed files with 2269 additions and 572 deletions
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,22 @@ |
||||
</div> |
||||
|
||||
<div id="footer"> |
||||
<!--BEGIN GENERATE_TREEVIEW--> |
||||
<li class="footer">$generatedby |
||||
<a href="http://www.doxygen.org/index.html"> |
||||
<img class="footer" src="doxygen.png" alt="doxygen"/></a> $doxygenversion </li> |
||||
</ul> |
||||
<!--END GENERATE_TREEVIEW--> |
||||
<!--BEGIN !GENERATE_TREEVIEW--> |
||||
<address class="footer"><small> |
||||
$generatedby  <a href="http://www.doxygen.org/index.html"> |
||||
<img class="footer" src="$relpath$doxygen.png" alt="doxygen"/> |
||||
</a> $doxygenversion |
||||
</small></address> |
||||
<!--END !GENERATE_TREEVIEW--> |
||||
</div> |
||||
|
||||
</div> |
||||
|
||||
</body> |
||||
</html> |
||||
@ -0,0 +1,17 @@ |
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
||||
<html xmlns="http://www.w3.org/1999/xhtml"> |
||||
<head> |
||||
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/> |
||||
<meta http-equiv="X-UA-Compatible" content="IE=9"/> |
||||
<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME--> |
||||
<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME--> |
||||
<link href="$relpath$doxy_stylesheet.css" rel="stylesheet" type="text/css" /> |
||||
$treeview |
||||
$search |
||||
$mathjax |
||||
</head> |
||||
|
||||
<div id="container"> |
||||
|
||||
<div id="body"> |
||||
<div> |
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,38 @@ |
||||
/*
|
||||
* |
||||
* This file is part of Libav. |
||||
* |
||||
* Libav is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU Lesser General Public |
||||
* License as published by the Free Software Foundation; either |
||||
* version 2.1 of the License, or (at your option) any later version. |
||||
* |
||||
* Libav is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
* Lesser General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Lesser General Public |
||||
* License along with Libav; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
#ifndef AVFILTER_BUFFERSRC_H |
||||
#define AVFILTER_BUFFERSRC_H |
||||
|
||||
/**
|
||||
* @file |
||||
* Memory buffer source API. |
||||
*/ |
||||
|
||||
#include "avfilter.h" |
||||
|
||||
/**
|
||||
* Add a buffer to the filtergraph s. |
||||
* |
||||
* @param buf buffer containing frame data to be passed down the filtergraph. |
||||
* This function will take ownership of buf, the user must not free it. |
||||
*/ |
||||
int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf); |
||||
|
||||
#endif /* AVFILTER_BUFFERSRC_H */ |
||||
Loading…
Reference in new issue