diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 13:04:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 13:04:30 +0200 |
| commit | 3d3a7f5034a2ccab0e6ae655c8f9610308773714 (patch) | |
| tree | 905bd0fb8ebb36b04b75efb4033bdfefc1cb4cb0 /libavutil/timestamp.h | |
| parent | f4f8499c19734e1200a9a824734dbc36fba48ce6 (diff) | |
| parent | 72072bf9de3241848ea86f68d2297b7a5d6ad49b (diff) | |
| download | ffmpeg-3d3a7f5034a2ccab0e6ae655c8f9610308773714.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: Drop a faulty assert
Conflicts:
libavcodec/mpegvideo.c
Merge for metadata only, the change looks wrong.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/timestamp.h')
0 files changed, 0 insertions, 0 deletions