summaryrefslogtreecommitdiff
path: root/libavcodec/motion_est.h
Commit message (Collapse)AuthorAge
* Merge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'Michael Niedermayer2015-07-27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6': lavc: Deprecate avctx.me_method Conflicts: doc/encoders.texi libavcodec/avcodec.h libavcodec/libx264.c libavcodec/motion_est.c libavcodec/options_table.h libavcodec/version.h Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: Deprecate avctx.me_methodVittorio Giovara2015-07-27
| | | | | | | | | | | | | | | | This option is extremely codec specific and only a few codecs employ it. Move it to codec private options instead: mpegenc family supports only 3 values, xavs and x264 use 5, and xvid has a different metric entirely. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d'Michael Niedermayer2015-06-12
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d': mpegvideo: h263: Move all tables to a single file Conflicts: libavcodec/h263.h libavcodec/h263data.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: h263: Move all tables to a single fileVittorio Giovara2015-06-12
| |
* | Merge commit '149fa0b7ac180fe1df48a2e379c560813555bf57'Michael Niedermayer2015-06-01
|/ | | | | | | | | | * commit '149fa0b7ac180fe1df48a2e379c560813555bf57': mpegvideo: Move MotionEstContext and function declarations to a separate header Conflicts: libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* mpegvideo: Move MotionEstContext and function declarations to a separate headerVittorio Giovara2015-05-31