diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 18:47:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 18:56:44 +0200 |
| commit | 137f7a630b5f91d6baa74a75cca8dd920107c4c6 (patch) | |
| tree | 0e8e4531413744280fe0d7502f10e6b9ef9d6a65 /libavdevice/iec61883.c | |
| parent | a92192d2e4f7ff3078b128592f6673089b221cc4 (diff) | |
| parent | 557d4c4ecae080729e68df54ed2bd8420d0f037a (diff) | |
| download | ffmpeg-137f7a630b5f91d6baa74a75cca8dd920107c4c6.tar.gz | |
Merge commit '557d4c4ecae080729e68df54ed2bd8420d0f037a'
* commit '557d4c4ecae080729e68df54ed2bd8420d0f037a':
avconv: replace AVCodecContext.time_base with framerate
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/iec61883.c')
0 files changed, 0 insertions, 0 deletions