diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 03:40:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 03:40:19 +0200 |
| commit | ab46300078d6c047c975c43baa71a32ca707e312 (patch) | |
| tree | 7c19f2d74084f63bc80e72af6e5056266f05b4c3 /libavformat | |
| parent | 39afcf1d7eba8f2f3d59c973aa57df714e679629 (diff) | |
| parent | 86dd5fbf1505a09afe8eaa66548e8876d5a9e817 (diff) | |
Merge remote-tracking branch 'dwbuiten/master'
* dwbuiten/master:
doc: Remove stray @item from git-howto
libfdk-aac: Port to ff_alloc_packet2
doxy: move av_guess_sample_aspect_ratio to correct place
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 7dad8e27fe..3bbc68387d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1949,6 +1949,10 @@ const struct AVCodecTag *avformat_get_riff_video_tags(void); const struct AVCodecTag *avformat_get_riff_audio_tags(void); /** + * @} + */ + +/** * Guesses the sample aspect ratio of a frame, based on both the stream and the * frame aspect ratio. * @@ -1971,8 +1975,4 @@ AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *strea * @} */ -/** - * @} - */ - #endif /* AVFORMAT_AVFORMAT_H */ |