diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 05:49:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 05:51:27 +0100 |
| commit | c237e88d51b9da12026734101a9ba578d04b4b15 (patch) | |
| tree | 4619fc3624a92400ad92ee2b61e42f3678037a67 /presets | |
| parent | 4f22e39e65e9e4705845fb091a05ca4526eb835a (diff) | |
| parent | 9b749c8274f6b6f35dde2cf29b99fa4f719abf87 (diff) | |
| download | ffmpeg-c237e88d51b9da12026734101a9ba578d04b4b15.tar.gz | |
Merge commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87'
* commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87':
h264: move relevant fields from Picture to H264Picture
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets')
0 files changed, 0 insertions, 0 deletions