diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-22 13:45:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-22 13:45:34 +0200 |
| commit | 3bf189bb00863a6ffc88e2a4770ccc6106551a96 (patch) | |
| tree | e103600f1b7bf4e0f2e8464defbdbd2039d0b663 /libavcodec/mjpeg2jpeg_bsf.c | |
| parent | 5e6be52bacb907492f71f7d57978fe10cb278c4c (diff) | |
| parent | 1ae8198bca749a0cff205196cc83d35b9962849b (diff) | |
| download | ffmpeg-3bf189bb00863a6ffc88e2a4770ccc6106551a96.tar.gz | |
Merge commit '1ae8198bca749a0cff205196cc83d35b9962849b'
* commit '1ae8198bca749a0cff205196cc83d35b9962849b':
avconv: always reset packet pts after decoding an audio frame
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg2jpeg_bsf.c')
0 files changed, 0 insertions, 0 deletions