Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse source 
* qatar/master:
  pthread: make sure AVFrame.extended_data is set properly.
  libfdk-aac: reindent after last commit
  libfdk-aac: Limit to supported sample rates.
  cbrt_tablegen: Include libm.h
  oggparsetheora: make it more robust
  ogg: prevent NULL pointer deference in theora gptopts

Conflicts:
	libavformat/oggparsetheora.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-09-25 16:11:34 +02:00
commit abcaacf1ac
4 changed files with 39 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libavcodec/cbrt_tablegen.c
View file

@ -21,6 +21,7 @@
*/
#include <stdlib.h>
#include "libavutil/libm.h"
#define CONFIG_HARDCODED_TABLES 0
#include "cbrt_tablegen.h"
#include "tableprint.h"