diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 02:10:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 02:10:05 +0100 |
| commit | c849b00b804cc02b6d68e02d8f7814369118bb83 (patch) | |
| tree | 58028f9d5b4c7aa4ece411c6f977f059e4c587c9 /libavfilter/af_adelay.c | |
| parent | 6a24d77929e0d5425c79a081034719ac68199602 (diff) | |
| parent | 8370a6fa59429e420999a738bc6c0d5a6ac4003a (diff) | |
| download | ffmpeg-c849b00b804cc02b6d68e02d8f7814369118bb83.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libavformat/mpegts: expose raw packet size
Conflicts:
libavformat/mpegts.c
See: f9b997c337873dad99f7fd505588b260febaf32b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_adelay.c')
0 files changed, 0 insertions, 0 deletions