generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70'

Browse Source 
* commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70':
  lavc: add a public API for parsing vorbis packets.

Conflicts:
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/version.h
	libavcodec/vorbis_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-11-06 11:21:47 +01:00
parent 5f7887ca8d 5e80fb7ff2
commit 44fa2671e0
8 changed files with 149 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/libvorbisenc.c
View File

@@ -27,7 +27,7 @@
#include "audio_frame_queue.h"
#include "internal.h"
#include "vorbis.h"
#include "vorbis_parser.h"
#include "vorbis_parser_internal.h"
/* Number of samples the user should send in each call.