eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-16 03:50:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  sunrast: Check for out of bounds reads
  lavc: rename AV_ER_* options to AV_EF_* and rename AGGRESSIVE to BUFFER
  lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-conflicting name
  Add libvpx presets.
  doc/avtools: add forgotten part to stream specifiers description
  swscale: prevent overflow during initialization
  g722: Add a fate test for the encoder
  fate: Add a target for creating a 16000 Hz mono synthetic audio file
  macosx: use the default surface on newer sdl

Conflicts:
	ffplay.c
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-10-19 01:32:05 +02:00
parent 35674a29b7 d97ca425ef
commit 70d9fb6963
10 changed files with 100 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/avcodec.h
View File

@@ -2964,15 +2964,11 @@ typedef struct AVCodecContext {
* - encoding: unused
* - decoding: Set by user.
*/
#if FF_API_ER
int error_recognition2;
#else
int error_recognition;
#endif /* FF_API_ER */
#define AV_ER_CRCCHECK (1<<0)
#define AV_ER_BITSTREAM (1<<1)
#define AV_ER_AGGRESSIVE (1<<2)
#define AV_ER_EXPLODE (1<<3)
int err_recognition;
#define AV_EF_CRCCHECK (1<<0)
#define AV_EF_BITSTREAM (1<<1)
#define AV_EF_BUFFER (1<<2)
#define AV_EF_EXPLODE (1<<3)
/**
* Current statistics for PTS correction.
@@ -2984,7 +2980,6 @@ typedef struct AVCodecContext {
int64_t pts_correction_last_pts; /// PTS of the last frame
int64_t pts_correction_last_dts; /// DTS of the last frame
} AVCodecContext;
/**