eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-23 23:40:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00'

Browse Source 
* commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00':
  hlsenc: Allocate enough space for the pattern string
  lavc: Correct the description of pkt_dts
  avfilter: Compile FIFO filters unconditionally

Conflicts:
	libavcodec/avcodec.h
	libavfilter/Makefile
	libavfilter/allfilters.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-12-24 15:29:15 +01:00
parent d69238e991 3193b13aa1
commit ba8e909c82
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/avcodec.h
View File

@@ -1200,7 +1200,7 @@ typedef struct AVFrame {
int64_t pkt_pts;
/**
* dts from the last AVPacket that has been input into the decoder
* dts copied from the AVPacket that triggered returning this frame
* - encoding: unused
* - decoding: Read by user.
*/