diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 21:34:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 21:34:59 +0200 |
| commit | ddd86e4747f2e33bf6b6e0926e158c8998e05eb3 (patch) | |
| tree | 901996083e1c3716b6d48a4a68ef07e0f3e188e0 /.gitattributes | |
| parent | 547848f71184274f25b23e1bdacfffe80f1fdf34 (diff) | |
| parent | ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7 (diff) | |
| download | ffmpeg-ddd86e4747f2e33bf6b6e0926e158c8998e05eb3.tar.gz | |
Merge commit 'ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7'
* commit 'ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7':
mpegvideo_parser: export pixel format and dimensions
Conflicts:
libavcodec/mpegvideo_parser.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions