diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 04:59:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 05:08:46 +0100 |
| commit | 533bc4c0a30db6a6a4b75bb1094ad2e25f11ae51 (patch) | |
| tree | bbbbf157d57e32706fb35e0add19bfb9f7e8bcc5 /ffmpeg.c | |
| parent | 3dab9e804afe7f971a2dc6089c5615628fb4d81c (diff) | |
| parent | d66e305bd1b4f3e91ae4e7e549148509d0811672 (diff) | |
| download | ffmpeg-533bc4c0a30db6a6a4b75bb1094ad2e25f11ae51.tar.gz | |
Merge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672'
* commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672':
er: move relevant fields from Picture to ERPicture
Conflicts:
libavcodec/error_resilience.c
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions